Changeset 3196 for code/trunk/src/orxonox/objects/pickup/PickupSpawner.cc
- Timestamp:
- Jun 20, 2009, 9:20:47 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pch (added) merged: 3114-3118,3124-3125,3127-3131,3133,3138-3194
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/pickup/PickupSpawner.cc
r3079 r3196 33 33 34 34 #include "PickupSpawner.h" 35 35 36 #include "BaseItem.h" 36 #include "PickupInventory.h" // HACK; Only for hack, remove later37 #include "gui/GUIManager.h" // HACK; see above38 37 39 38 #include "core/CoreIncludes.h" 39 #include "core/Template.h" 40 40 #include "core/XMLPort.h" 41 #include "core/Template.h" 41 #include "gui/GUIManager.h" // HACK; see below 42 #include "objects/worldentities/pawns/Pawn.h" 43 #include "PickupInventory.h" // HACK; Only for hack, remove later 42 44 43 #include "objects/worldentities/pawns/Pawn.h"44 45 45 46 namespace orxonox … … 95 96 // & load the GUI itself too, along with some empty windows 96 97 // = even less delays 97 GUIManager::getInstance Ptr()->showGUI("PickupInventory");98 GUIManager::getInstance Ptr()->executeCode("hideGUI(\"PickupInventory\")");98 GUIManager::getInstance().showGUI("PickupInventory"); 99 GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")"); 99 100 PickupInventory::getSingleton(); 100 101 }
Note: See TracChangeset
for help on using the changeset viewer.