aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-10-27 08:48:01 -0400
committerClyne Sullivan <tullivan99@gmail.com>2015-10-27 08:48:01 -0400
commit135d46497cae4fbfcc500b3bd22b6c8d97d53084 (patch)
tree77d779c602069946f8dd07f66842f0652c2b8122 /src
parent69ce4512cae1b286a9807be03dfc295b6a4570f6 (diff)
bird AI + xcfs
Diffstat (limited to 'src')
-rw-r--r--src/entities.cpp6
-rw-r--r--src/gameplay.cpp4
2 files changed, 7 insertions, 3 deletions
diff --git a/src/entities.cpp b/src/entities.cpp
index da096bc..0479d5e 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -332,6 +332,7 @@ unsigned int Structures::spawn(_TYPE t, float x, float y){ //spawns a structure
void Mob::wander(int timeRun){
static int direction; //variable to decide what direction the entity moves
+ static unsigned int hey=0,hi=0;
switch(subtype){
case MS_RABBIT:
if(!ticksToUse){
@@ -350,7 +351,10 @@ void Mob::wander(int timeRun){
ticksToUse--; //removes one off of the entities timer
break;
case MS_BIRD:
- if(loc.y<=init_y-.2)vel.y+=.005*deltaTime; // TODO handle direction
+ if(loc.y<=init_y-.2)vel.y=.02*deltaTime; // TODO handle direction
+ vel.x=.02*deltaTime;
+ if(++hey==200){hey=0;hi^=1;}
+ if(hi)vel.x*=-1;
break;
default:
break;
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 1de542d..d1cc69d 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -84,9 +84,9 @@ void initEverything(void){
entity.push_back(mob.back());
mob.back()->spawn(200,100);
- mob.push_back(new Mob(2));
+ mob.push_back(new Mob(MS_BIRD));
entity.push_back(mob.back());
- mob.back()->spawn(200,100);
+ mob.back()->spawn(-500,500);
/*
* Link all the entities that were just created to the initial world, and setup a test AI function.