Changeset 8801 in orxonox.OLD for branches/network/src/util

Timestamp:

Jun 26, 2006, 4:30:31 PM (19 years ago)

Author:

rennerc

Message:

finished spawningpoint for spawning playables

Location:

branches/network/src/util

Files:

• game_rules.h (modified) (1 diff)
• multiplayer_team_deathmatch.cc (modified) (2 diffs)
• multiplayer_team_deathmatch.h (modified) (1 diff)

branches/network/src/util/game_rules.h

@@ -35 +35 @@
     /** adding a kill event to the kill list @param kill the kill object containing all infos */
     void registerKill(const Kill& kill);
+    virtual void registerSpawn( WorldEntity * we ){}
 
     virtual void onPlayerSpawn() {}
     virtual void onPlayerDeath() {}
-
 
     virtual void tick(float dt) = 0;

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -139 +139 @@
 
 /**
- * called when the player enters the game
- * @param player the spawned player
- */
-void MultiplayerTeamDeathmatch::onPlayerSpawn()
-{
-  this->bLocalPlayerDead = false;
-}
-
-
-/**
- * when the player is killed
- * @param player the killed player
- */
-void MultiplayerTeamDeathmatch::onPlayerDeath()
-{
-  this->bLocalPlayerDead = true;
-}
-
-
-/**
  * time tick
  * @param dt time
@@ -786 +766 @@
 }
 
+/**
+ * this function is called on player respawn
+ * @param we 
+ */
+void MultiplayerTeamDeathmatch::registerSpawn( WorldEntity * we )
+{
+  onRespawn( we->getOwner() );
+}
+

branches/network/src/util/multiplayer_team_deathmatch.h

@@ -41 +41 @@
     virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
 
-    virtual void onPlayerSpawn();
-    virtual void onPlayerDeath();
-
+    virtual void registerSpawn( WorldEntity * we );
 
     virtual void tick(float dt);