Changeset 7865 for code/trunk

Timestamp:

Feb 12, 2011, 3:08:59 PM (14 years ago)

Author:

landauf

Message:

renamed pong level, added a bot, and changed the pong gametype to spawn human players before bots (player will always get the left bat in singleplayer)

Location:

code/trunk

Files:

• data/levels/pong.oxw (moved) (moved from code/trunk/data/levels/presentationPong.oxw) (2 diffs)
• src/modules/pong/Pong.cc (modified) (1 diff)
• src/modules/pong/Pong.h (modified) (1 diff)

code/trunk/data/levels/pong.oxw

@@ +1 @@
+<LevelInfo
+ name = "Pong"
+ description = "Pong in space!"
+ tags = ""
+/>
+
 <?lua
   include("HUDTemplates3.oxo")
@@ -52 +58 @@
 
   <WorldAmbientSound source="mainmenu.ogg" playOnLoad=true />
+
+  <PongBot />
 
   <Scene

code/trunk/src/modules/pong/Pong.cc

@@ -132 +132 @@
     }
 
+    void Pong::spawnPlayersIfRequested()
+    {
+        // first spawn human players to assign always the left bat to the player in singleplayer
+        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
+            if (it->first->isHumanPlayer() && (it->first->isReadyToSpawn() || this->bForceSpawn_))
+                this->spawnPlayer(it->first);
+        // now spawn bots
+        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
+            if (!it->first->isHumanPlayer() && (it->first->isReadyToSpawn() || this->bForceSpawn_))
+                this->spawnPlayer(it->first);
+    }
+
     void Pong::spawnPlayer(PlayerInfo* player)
     {

code/trunk/src/modules/pong/Pong.h

@@ -57 +57 @@
 
         protected:
+            virtual void spawnPlayersIfRequested();
+
             void startBall();