[Orxonox-commit 4548] r9220 - in code/branches/captureTheFlag: data/levels src/modules/gametypes src/modules/pickup/items

[ninow at orxonox.net]

Author: ninow
Date: 2012-05-18 17:46:57 +0200 (Fri, 18 May 2012)
New Revision: 9220

Modified:
   code/branches/captureTheFlag/data/levels/captureTheFlag.oxw
   code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt
   code/branches/captureTheFlag/src/modules/pickup/items/CMakeLists.txt
   code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h
Log:
fixed some errors

Modified: code/branches/captureTheFlag/data/levels/captureTheFlag.oxw
===================================================================
--- code/branches/captureTheFlag/data/levels/captureTheFlag.oxw	2012-05-18 15:08:35 UTC (rev 9219)
+++ code/branches/captureTheFlag/data/levels/captureTheFlag.oxw	2012-05-18 15:46:57 UTC (rev 9220)
@@ -15,7 +15,7 @@
 ?>
 
 <Level
- gametype = "captureTheFlag"
+ gametype = "CaptureTheFlag"
 >
   <templates>
     <Template link=lodtemplate_default />

Modified: code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt
===================================================================
--- code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt	2012-05-18 15:08:35 UTC (rev 9219)
+++ code/branches/captureTheFlag/src/modules/gametypes/CMakeLists.txt	2012-05-18 15:46:57 UTC (rev 9220)
@@ -4,7 +4,7 @@
   SpaceRaceManager.cc
   OldSpaceRace.cc
   OldRaceCheckPoint.cc
-  captureTheFlag.cc
+  CaptureTheFlag.cc
 )
 
 ORXONOX_ADD_LIBRARY(gametypes

Modified: code/branches/captureTheFlag/src/modules/pickup/items/CMakeLists.txt
===================================================================
--- code/branches/captureTheFlag/src/modules/pickup/items/CMakeLists.txt	2012-05-18 15:08:35 UTC (rev 9219)
+++ code/branches/captureTheFlag/src/modules/pickup/items/CMakeLists.txt	2012-05-18 15:46:57 UTC (rev 9220)
@@ -6,4 +6,5 @@
   SpeedPickup.cc
   ShieldPickup.cc
   ShrinkPickup.cc
+  FlagPickup.cc
 )

Modified: code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h
===================================================================
--- code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h	2012-05-18 15:08:35 UTC (rev 9219)
+++ code/branches/captureTheFlag/src/modules/pickup/items/FlagPickup.h	2012-05-18 15:46:57 UTC (rev 9220)
@@ -40,9 +40,11 @@
 #include <string>
 
 #include "pickup/Pickup.h"
+#include "tools/Timer.h"
 
+
 namespace orxonox {
-
+/*
     @ingroup PickupItems
     */
     namespace pickupFlagType
@@ -75,6 +77,7 @@
 
 	    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.
 
@@ -96,7 +99,6 @@
 
             pickupFlagType::Value flagType_; //!< The type of the FlagPickup.
 
-            int teamScore_;
 
             //! Strings for the flag types.
             static const std::string flagTypeBlue_s;