diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2015-12-02 08:48:39 -0500 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-12-02 08:48:39 -0500 |
commit | b447a664066e98cc827626526179b3a3db22fa30 (patch) | |
tree | 9947254b1256e87ad167986b5bac9cf5be49c7d6 /src/entities.cpp | |
parent | 1d995c34c871bdb48e35c083ef0d9027dc18d719 (diff) |
world bg improvements
Diffstat (limited to 'src/entities.cpp')
-rw-r--r-- | src/entities.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 3286784..9c5e3cb 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -280,10 +280,6 @@ void Player::interact(){ //the function that will cause the player to search for * NPC::wander, this makes the npcs wander around the near area * * timeRun This variable is the amount of gameloop ticks the entity will wander for - * - * *v This is a pointer to whatever vec2 value is passed to it, usually the value - * passed is the entities vec2 for coordinates. Since the value is a pointer - * the memory address passed to it is directly modified. */ void NPC::wander(int timeRun){ @@ -339,7 +335,7 @@ void NPC::interact(){ //have the npc's interact back to the player } } -void Object::interact(void){ +void Object::interact(void){ if(questObject && alive){ ui::dialogBox("You",":Yes:No",pickupDialog); ui::waitForDialog(); @@ -435,7 +431,7 @@ void Mob::wander(int timeRun){ player->loc.x + player->width / 2 < loc.x + width ){ if(player->left)player->loc.x = loc.x + width; else if(player->right) player->loc.x = loc.x - player->width; - hey(); + hey(this); } break; default: |