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

Timestamp:

May 26, 2009, 2:28:24 AM (16 years ago)

Author:

landauf

Message:

Added forward declarations to OrxonoxPrereqs.h.

Location:

code/trunk/src/orxonox/objects/pickup

Files:

• DroppedItem.cc (modified) (3 diffs)
• DroppedItem.h (modified) (2 diffs)
• ModifierPickup.cc (modified) (3 diffs)
• PickupCollection.cc (modified) (1 diff)
• PickupCollection.h (modified) (3 diffs)
• PickupInventory.cc (modified) (4 diffs)
• PickupInventory.h (modified) (1 diff)
• PickupSpawner.cc (modified) (1 diff)
• PickupSpawner.h (modified) (2 diffs)
• items/HealthImmediate.cc (modified) (1 diff)
• items/HealthImmediate.h (modified) (1 diff)
• items/HealthUsable.cc (modified) (2 diffs)
• items/HealthUsable.h (modified) (1 diff)
• items/Jump.cc (modified) (1 diff)
• items/Jump.h (modified) (1 diff)

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

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Daniel 'Huty' Haggenmueller
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #include "DroppedItem.h"
 
@@ -7 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "core/Core.h"
 
 namespace orxonox
@@ -68 +95 @@
         Model* model = new Model(item);
         Billboard* billboard = new Billboard(item);
-        
+
         model->setMeshSource("sphere.mesh");
         model->setScale(3.0f);

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

@@ -43 +43 @@
 namespace orxonox
 {
-    class BaseItem;
-    class Pawn;
-
     class _OrxonoxExport DroppedItem : public StaticEntity, public Tickable
     {
@@ -66 +63 @@
             { this->triggerDistance_ = distance; }
 
-        inline BaseItem* getItem() const 
+        inline BaseItem* getItem() const
             { return this->item_; }
         inline void setItem(BaseItem* item)

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

@@ -37 +37 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "core/Core.h"
 
 #include "objects/worldentities/pawns/Pawn.h"
-
-#include "util/Debug.h"
 
 namespace orxonox
@@ -110 +107 @@
                 this->timer_.setTimer(this->duration_, false, this, executor);
             }
-            
+
             return true;
         }
@@ -140 +137 @@
                 pawn->getPickups().removeMultiplicativeModifier((*it).first, (*it).second);
             }
-            
+
             if (this->timer_.getRemainingTime() > 0.0f)
                 this->timer_.stopTimer();

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

@@ -40 +40 @@
 
 #include "core/CoreIncludes.h"
-
-#include "objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox

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

@@ -41 +41 @@
 #include <string>
 
-#include "util/Math.h"  
+#include "util/Math.h"
 
 #include "ModifierType.h"
@@ -47 +47 @@
 namespace orxonox
 {
-    class BaseItem;
-    class EquipmentItem;
-    class PassiveItem;
-    class UsableItem;
-    class Pawn;
-
     /**
         @brief PickupCollection for organising items.
@@ -97 +91 @@
             @return Returns the pawn which owns the PickupCollection.
         */
-        inline Pawn* getOwner() const 
+        inline Pawn* getOwner() const
             { return this->owner_; }
         /**

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

@@ -33 +33 @@
 #include "UsableItem.h"
 
-#include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"
 #include "core/input/InputManager.h"
@@ -50 +49 @@
 namespace orxonox
 {
-    orxonox::ConsoleCommand& function_PickupInventory_ToggleInventory_0 =
-        orxonox::CommandExecutor::addConsoleCommandShortcut(orxonox::createConsoleCommand(orxonox::createFunctor(&PickupInventory::toggleInventory), "toggleInventory"), true);
+    SetConsoleCommandShortcut(PickupInventory, toggleInventory);
 
     PickupInventory* PickupInventory::pickupInventory_s = NULL;
@@ -83 +81 @@
     }
 
-    
+
 
     void PickupInventory::toggleInventory()
@@ -303 +301 @@
 
     void PickupInventory::createItemWindows(CEGUI::WindowManager* winMgr, const std::string& id, int x, int y)
-    { 
+    {
         if(!winMgr) { return; }
 

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

@@ -45 +45 @@
 {
 // tolua_end
-    class _OrxonoxExport BaseItem;
-
     /**
         @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

@@ -42 +42 @@
 
 #include "objects/worldentities/pawns/Pawn.h"
-#include "objects/worldentities/triggers/DistanceTrigger.h"
 
 namespace orxonox

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

@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
-#include "core/BaseObject.h"
 #include "objects/Tickable.h"
 #include "objects/worldentities/StaticEntity.h"
@@ -44 +43 @@
 namespace orxonox
 {
-    class BaseItem;
-
     /**
         @brief PickupSpawner.

code/trunk/src/orxonox/objects/pickup/items/HealthImmediate.cc

@@ -38 +38 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "core/Core.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/pickup/items/HealthImmediate.h

@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
-#include "../PassiveItem.h"
+#include "objects/pickup/PassiveItem.h"
 
 namespace orxonox
 {
-    class Pawn;
-
     /**
         @brief Health-item, immediatly recovers health when picked up.

code/trunk/src/orxonox/objects/pickup/items/HealthUsable.cc

@@ -33 +33 @@
 
 #include "HealthUsable.h"
-#include "../DroppedItem.h"
+#include "objects/pickup/DroppedItem.h"
 
 #include "objects/worldentities/pawns/Pawn.h"
@@ -39 +39 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "core/Core.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/pickup/items/HealthUsable.h

@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
-#include "../UsableItem.h"
+#include "objects/pickup/UsableItem.h"
 #include "util/Math.h"
 
 namespace orxonox
 {
-    class Pawn;
-
     /**
         @brief Health-item, enables player recover health when used.

code/trunk/src/orxonox/objects/pickup/items/Jump.cc

@@ -39 +39 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "core/Core.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/pickup/items/Jump.h

@@ -44 +44 @@
 namespace orxonox
 {
-    class Pawn;
-
     /**
         @brief Jump-item, enables player to "jump" into a direction.