Changeset 9220 for code/branches

Timestamp:

May 18, 2012, 5:46:57 PM (13 years ago)

Author:

ninow

Message:

fixed some errors

Location:

code/branches/captureTheFlag

Files:

• data/levels/captureTheFlag.oxw (modified) (1 diff)
• src/modules/gametypes/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/items/FlagPickup.h (modified) (3 diffs)

code/branches/captureTheFlag/data/levels/captureTheFlag.oxw

@@ -16 +16 @@
 
 <Level
- gametype = "captureTheFlag"
+ gametype = "CaptureTheFlag"
 >
   <templates>

code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt

@@ -5 +5 @@
   OldSpaceRace.cc
   OldRaceCheckPoint.cc
-  captureTheFlag.cc
+  CaptureTheFlag.cc
 )
 

code/branches/captureTheFlag/src/modules/pickup/items/CMakeLists.txt

@@ -7 +7 @@
   ShieldPickup.cc
   ShrinkPickup.cc
+  FlagPickup.cc
 )

code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h

@@ -41 +41 @@
 
 #include "pickup/Pickup.h"
+#include "tools/Timer.h"
+
 
 namespace orxonox {
-
+/*
     @ingroup PickupItems
     */
@@ -76 +78 @@
             const std::string& getFlagType(void) const; //!< Get the flag type of this pickup.
 
+        int teamScore_;
 
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
@@ -97 +100 @@
             pickupFlagType::Value flagType_; //!< The type of the FlagPickup.
 
-            int teamScore_;
 
             //! Strings for the flag types.