Changeset 9301 for code/branches/presentation2012merge

Timestamp:

Jun 16, 2012, 3:23:01 PM (12 years ago)

Author:

jo

Message:

Quick fix: Suppress default bots in racing gametypes, since so far we haven't a racing bot implemented yet.

Location:

code/branches/presentation2012merge

Files:

• data/levels/surfaceRace.oxw (modified) (3 diffs)
• src/modules/gametypes/OldSpaceRace.h (modified) (1 diff)
• src/modules/gametypes/SpaceRace.cc (modified) (1 diff)

code/branches/presentation2012merge/data/levels/surfaceRace.oxw

@@ +1 @@
+<!-- 
+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"
@@ -17 +23 @@
 
 <Level
-gametype = SpaceRace
+  gametype = SpaceRace
 >
 
@@ -33 +39 @@
     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"/>

code/branches/presentation2012merge/src/modules/gametypes/OldSpaceRace.h

@@ -59 +59 @@
 
             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)

code/branches/presentation2012merge/src/modules/gametypes/SpaceRace.cc

@@ -48 +48 @@
         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.
     }