aboutsummaryrefslogtreecommitdiffstats
path: root/src/entities.cpp
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2015-12-03 07:44:47 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2015-12-03 07:44:47 -0500
commitdc24164926a7988e018d32fff1977d2b40c89057 (patch)
treed9e5e18a7b2582f0e0efe19d4b410d3ccdb05902 /src/entities.cpp
parent1d995c34c871bdb48e35c083ef0d9027dc18d719 (diff)
Added holding vs press key action
Diffstat (limited to 'src/entities.cpp')
-rw-r--r--src/entities.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/entities.cpp b/src/entities.cpp
index 3286784..ee5a542 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -122,7 +122,6 @@ Structures::Structures(){ //sets the structure type
inWorld = NULL;
}
Structures::~Structures(){
- delete inv;
delete tex;
delete[] name;
}
@@ -177,7 +176,6 @@ Object::Object(ITEM_ID id, bool qo, const char *pd){
Object::~Object(){
delete[] pickupDialog;
- delete inv;
delete tex;
delete[] name;
}
@@ -339,7 +337,8 @@ 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();