Changeset 7039 in orxonox.OLD

Timestamp:

Feb 6, 2006, 12:47:01 AM (18 years ago)

Author:

patrick

Message:

trunk: game rules definitions added

Location:

trunk/src

Files:

• story_entities/game_world_data.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (8 diffs)
• util/multiplayer_team_deathmatch.h (modified) (3 diffs)
• util/state.cc (modified) (1 diff)
• util/state.h (modified) (3 diffs)

trunk/src/story_entities/game_world_data.cc

@@ -376 +376 @@
     {
       this->gameRule = dynamic_cast<GameRules*>(created);
+      State::setGameRules(this->gameRule);
     }
     else

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -20 +20 @@
 #include "factory.h"
 
+#include "render2D/billboard.h"
+#include "state.h"
+
 
 using namespace std;
@@ -37 +40 @@
   this->bLocalPlayerDead = false;
   this->deathTimeout = 10.0f;     // 5 seconds
+  this->deathScreen = new Billboard();
+  this->deathScreen->setSize(State::getResX(), State::getResY());
 
   if( root != NULL)
@@ -59 +64 @@
   LoadParam(root, "max-kills", this, MultiplayerTeamDeathmatch, setMaxKills)
       .describe("sets the maximal kills for winning condition");
+
+  LoadParam(root, "death-screen-image", this, MultiplayerTeamDeathmatch, setDeathScreen)
+      .describe("sets the death screen image");
+
 }
+
+
+
+void MultiplayerTeamDeathmatch::setDeathScreen(const char* imageName)
+{
+  if( this->deathScreen)
+    this->deathScreen->setTexture(imageName);
+}
+
 
 
@@ -67 +85 @@
  */
 void MultiplayerTeamDeathmatch::onPlayerSpawn(Player* player)
-{}
+{
+  this->bLocalPlayerDead = true;
+}
 
 
@@ -75 +95 @@
  */
 void MultiplayerTeamDeathmatch::onPlayerDeath(Player* player)
-{}
+{
+  this->localPlayer = player;
+  this->bLocalPlayerDead = true;
+}
 
 
@@ -84 +107 @@
 void MultiplayerTeamDeathmatch::tick(float dt)
 {
+  this->checkGameRules();
 
+  // is the local player dead and inactive
+  if( unlikely(this->bLocalPlayerDead))
+  {
+    this->timeout += dt;
+
+    // long enough dead?
+    if( dt >= this->deathTimeout)
+    {
+      this->timeout = 0.0f;
+
+      // respawn
+    }
+  }
 }
 
@@ -92 +129 @@
  */
 void MultiplayerTeamDeathmatch::draw()
-{}
+{
+  if( unlikely( this->bLocalPlayerDead))
+  {
+
+  }
+}
 
 
@@ -99 +141 @@
  */
 void MultiplayerTeamDeathmatch::checkGameRules()
-{}
+{
+  //
+  // check for max killing count
+  if( this->teamAKills >= this->maxKills)
+  {
+    // team A winns
+  }
+  else if( this->teamBKills >= this->maxKills)
+  {
+    // team B winns
+  }
+}
 
 

trunk/src/util/multiplayer_team_deathmatch.h

@@ -16 +16 @@
 class ObjectManager;
 class Player;
+class Billboard;
 
 
@@ -37 +38 @@
     inline void setDeathPenaltyTimeout(float time) { this->deathTimeout = time; }
     inline void setMaxKills(int kills) { this->maxKills = kills; }
+    void setDeathScreen(const char* imageName);
 
   protected:
@@ -44 +46 @@
     bool               bLocalPlayerDead;           //!< true if the local player is dead
     float              deathTimeout;               //!< timeout a player cannot play if he/she dies
+    float              timeout;                    //!< time counted if player dead
     int                maxKills;                   //!< max kills for winning condition
 
     int                teamAKills;                 //!< kills of team A
     int                teamBKills;                 //!< kills of team B
+
+    Billboard*         deathScreen;                //!< the death screen
 };
 

trunk/src/util/state.cc

@@ -44 +44 @@
 
 StoryEntity* State::storyEntity = NULL;
+GameRules* State::gameRules = NULL;
 
 Player* State::player = NULL;

trunk/src/util/state.h

@@ -17 +17 @@
 class StoryEntity;
 class ObjectManager;
+class GameRules;
 
 
@@ -68 +69 @@
   static inline StoryEntity* getCurrentStoryEntity() { return State::storyEntity; };
 
+  /** @param gameRules sets the current GameRules */
+  static inline void setGameRules(GameRules* gameRules) { State::gameRules = gameRules; }
+  /** @returns the GameRules reference*/
+  static inline GameRules* getGameRules() { return State::gameRules; }
+
   //////////////
   /// PLAYER ///
@@ -106 +112 @@
   static ObjectManager*         objectManager;      //!< A reference to the current ObjectManager
   static StoryEntity*           storyEntity;        //!< A reference to the current StoryEntity played
+  static GameRules*             gameRules;          //!< A reference to the GameRules
   static Player*                player;             //!< A reference to the Player