aboutsummaryrefslogtreecommitdiffstats
path: root/src/entities.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/entities.cpp')
-rw-r--r--src/entities.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/entities.cpp b/src/entities.cpp
index 1e6fad5..3286784 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -339,18 +339,14 @@ void NPC::interact(){ //have the npc's interact back to the player
}
}
-extern void waitForDialog(void);
-void Object::interact(void){
+void Object::interact(void){
if(questObject && alive){
-
ui::dialogBox("You",":Yes:No",pickupDialog);
- while(ui::dialogBoxExists);
-
- if(ui::dialogOptChosen == 1 && alive){
+ ui::waitForDialog();
+ if(ui::dialogOptChosen == 1){
player->inv->addItem((ITEM_ID)(identifier), (char)1);
alive = false;
- return;
- }
+ }
}else{
alive = false;
player->inv->addItem((ITEM_ID)(identifier), (char)1);