diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2015-12-11 08:38:38 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-12-11 08:38:38 -0500 |
| commit | 43bbcf02fd5e4e69a9aa521fa4cd572cc8675cf3 (patch) | |
| tree | 1f9a4def2c1b236e9762dbb8d0b8fe9143b7a9a1 /src/entities.cpp | |
| parent | 2baf10d54f1cbfdb781b9b37987e0815dbdafc3f (diff) | |
first areas plotted
Diffstat (limited to 'src/entities.cpp')
| -rw-r--r-- | src/entities.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 1c36ca7..5c00cc7 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -148,7 +148,7 @@ Mob::Mob(int sub){ height = HLINE * 8; tex = new Texturec(1, "assets/robin.png"); case MS_TRIGGER: - width = HLINE * 8; + width = HLINE * 20; height = 2000; tex = new Texturec(0); break; @@ -337,7 +337,7 @@ void NPC::interact(){ //have the npc's interact back to the player if(aiFunc.size())aiFunc.erase(aiFunc.begin()); } }else{ - ui::dialogBox(name,NULL,randomDialog[randDialog]); + ui::dialogBox(name,NULL,false,randomDialog[randDialog]); } ui::waitForDialog(); canMove=true; @@ -345,7 +345,7 @@ void NPC::interact(){ //have the npc's interact back to the player void Object::interact(void){ if(questObject && alive){ - ui::dialogBox(player->name,":Yes:No",pickupDialog); + ui::dialogBox(player->name,":Yes:No",false,pickupDialog); ui::waitForDialog(); if(ui::dialogOptChosen == 1){ player->inv->addItem((ITEM_ID)(identifier), (char)1); @@ -434,8 +434,6 @@ void Mob::wander(int timeRun){ case MS_TRIGGER: if(player->loc.x + player->width / 2 > loc.x && 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(this); } break; |