[Orxonox-commit 4630] r9301 - in code/branches/presentation2012merge: data/levels src/modules/gametypes

[jo at orxonox.net]

Author: jo
Date: 2012-06-16 15:23:01 +0200 (Sat, 16 Jun 2012)
New Revision: 9301

Modified:
   code/branches/presentation2012merge/data/levels/surfaceRace.oxw
   code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h
   code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc
Log:
Quick fix: Suppress default bots in racing gametypes, since so far we haven't a racing bot implemented yet.

Modified: code/branches/presentation2012merge/data/levels/surfaceRace.oxw
===================================================================
--- code/branches/presentation2012merge/data/levels/surfaceRace.oxw	2012-06-16 08:13:18 UTC (rev 9300)
+++ code/branches/presentation2012merge/data/levels/surfaceRace.oxw	2012-06-16 13:23:01 UTC (rev 9301)
@@ -1,6 +1,12 @@
+<!-- 
+TODO:
+    Replace bottom's texture. It just does not look good.
+    Pickups are not displayed properly.
+-->
+
 <LevelInfo
  name = "Surface Race"
- description = "just awesome"
+ description = "Race on a planet's surface."
  screenshot = "surfaceRace.png"
  tags = "gametype"
 />
@@ -16,7 +22,7 @@
 
 
 <Level
-gametype = SpaceRace
+  gametype = SpaceRace
 >
 
   <templates>
@@ -33,6 +39,10 @@
     hasPhysics   = true
   >
 
+    <?lua
+      include("includes/pickups.oxi")
+    ?>
+
   <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
 
 

Modified: code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h
===================================================================
--- code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h	2012-06-16 08:13:18 UTC (rev 9300)
+++ code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h	2012-06-16 13:23:01 UTC (rev 9301)
@@ -58,6 +58,8 @@
             virtual void end();
 
             virtual void newCheckpointReached();
+            virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command.
+                                                        //<! This is only a temporary solution. Better: create racingBots.
 
             inline void setCheckpointsReached(int n)
                 { this->checkpointsReached_ = n;}

Modified: code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc	2012-06-16 08:13:18 UTC (rev 9300)
+++ code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc	2012-06-16 13:23:01 UTC (rev 9301)
@@ -47,6 +47,8 @@
 
         this->cantMove_ = false;
         this->bTimeIsUp_ = false;
+        this->numberOfBots_ = 0; // quick fix: don't allow default-bots to enter the race
+                                 // remove this line, if a raceBot has been created.
     }
 
     void SpaceRace::end()