diff options
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 1fefa9a..9d0ea9b 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -151,7 +151,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; @@ -355,7 +355,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; @@ -363,7 +363,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); @@ -453,8 +453,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; |