Changeset 3370 for code/trunk/src/orxonox/objects/pickup

Timestamp:

Jul 30, 2009, 2:10:44 PM (15 years ago)

Author:

rgrieder

Message:

Merged resource branch back to the trunk. Changes:

• Automated graphics loading by evaluating whether a GameState requires it
• Using native Tcl library (x3n)

Windows users: Update your dependency package!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/pickup/BaseItem.h (modified) (1 diff)
• src/orxonox/objects/pickup/PickupInventory.cc (modified) (1 diff)
• src/orxonox/objects/pickup/PickupInventory.h (modified) (1 diff)
• src/orxonox/objects/pickup/PickupSpawner.cc (modified) (1 diff)

code/trunk/src/orxonox/objects/pickup/BaseItem.h

@@ -51 +51 @@
             Daniel 'Huty' Haggenmueller
     */
-    class _OrxonoxExport BaseItem
-// tolua_end
-        : public BaseObject
-// tolua_begin
+    class _OrxonoxExport BaseItem : public BaseObject
     {
 // tolua_end

code/trunk/src/orxonox/objects/pickup/PickupInventory.cc

@@ -37 +37 @@
 
 #include "core/ConsoleCommand.h"
+#include "core/GUIManager.h"
 #include "core/input/InputManager.h"
-#include "gui/GUIManager.h"
 #include "objects/controllers/HumanController.h"
 #include "objects/worldentities/pawns/Pawn.h"

code/trunk/src/orxonox/objects/pickup/PickupInventory.h

@@ -43 +43 @@
 namespace orxonox
 {
-// tolua_end
     /**
         @brief Static class for the inventory GUI window.
         @author Daniel 'Huty' Haggenmueller
     */
-// tolua_begin
     class _OrxonoxExport PickupInventory
     {

code/trunk/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -37 +37 @@
 
 #include "core/CoreIncludes.h"
+#include "core/GUIManager.h"     // HACK; see below
 #include "core/Template.h"
 #include "core/XMLPort.h"
-#include "gui/GUIManager.h"     // HACK; see below
 #include "objects/worldentities/pawns/Pawn.h"
 #include "PickupInventory.h"    // HACK; Only for hack, remove later