Changeset 8802 in orxonox.OLD for trunk/src/util/multiplayer_team_deathmatch.h

Timestamp:

Jun 26, 2006, 4:46:25 PM (18 years ago)

Author:

patrick

Message:

merged the network branche back to trunk

File:

• trunk/src/util/multiplayer_team_deathmatch.h (modified) (5 diffs)

trunk/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);
@@ -50 +48 @@
     inline void setDeathPenaltyTimeout(float time) { this->deathTimeout = time; }
     inline void setMaxKills(int kills) { this->maxKills = kills; }
-    void setDeathScreen(const std::string& imageName);
     
     inline void setNumTeams( int numTeams ){ this->numTeams = numTeams; }
@@ -58 +55 @@
     
     virtual void process(const Event &event);
+    
+    void onKill( int killedUserId, int userId );
+    void onRespawn( int userId );
     
     virtual void handleChatMessage( int userId, const std::string & message, int messageType );
@@ -73 +73 @@
 
     std::map<int,int>  teamScore;                  //!< team score
-
-    ImagePlane*        deathScreen;                //!< the death screen
 
     int                currentGameState;           //!< game state
@@ -100 +98 @@
     
     void onInputEnter( const std::string & text );
+    
+    OrxGui::GLGuiBox* statsBox;
+    OrxGui::GLGuiTable* table;
+    void tickStatsTable();
+    
+    void showStats();
+    void hideStats();
 };