]> code.bitgloo.com Git - clyne/gamedev.git/commitdiff
Added holding vs press key action
authordrumsetmonkey <abelleisle@roadrunner.com>
Thu, 3 Dec 2015 12:46:23 +0000 (07:46 -0500)
committerdrumsetmonkey <abelleisle@roadrunner.com>
Thu, 3 Dec 2015 12:46:23 +0000 (07:46 -0500)
1  2 
src/entities.cpp
src/gameplay.cpp
src/ui.cpp

index ee5a5420a16e8e7b89111b44b89851a3797b49c0,f0e7d169b0cd8287359373f0bf04baf7bf975a32..7f786373163e636d878978222a51690cedea3357
@@@ -120,10 -120,13 +120,12 @@@ Structures::Structures(){ //sets the st
        tex = new Texturec(1,"assets/house1.png");
        
        inWorld = NULL;
+       name = NULL;
  }
  Structures::~Structures(){
 -      //delete inv;
        delete tex;
-       delete[] name;
+       if(name)
+               delete[] name;
  }
  
  Mob::Mob(int sub){
@@@ -175,7 -178,8 +177,6 @@@ Object::Object(ITEM_ID id, bool qo, con
  }
  Object::~Object(){
        delete[] pickupDialog;
--      
 -      //delete inv;
        delete tex;
        delete[] name;
  }
Simple merge
diff --cc src/ui.cpp
Simple merge