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

Timestamp:

Jun 20, 2006, 1:39:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:

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

trunk/src/util/multiplayer_team_deathmatch.h

@@ -12 +12 @@
 #include "network_game_rules.h"
 
-#include "glgui_box.h"
+#include "glgui.h"
 
 class TiXmlElement;
@@ -27 +27 @@
 
 
-class MultiplayerTeamDeathmatch : public NetworkGameRules
+class MultiplayerTeamDeathmatch : public NetworkGameRules, public EventListener
 {
 
@@ -55 +55 @@
     
     int getRandomTeam();
+    
+    virtual void process(const Event &event);
+    
+    virtual void handleChatMessage( int userId, const std::string & message, int messageType );
 
   protected:
@@ -74 +78 @@
     float              gameStateTimer;             //!< if less than 0 -> change game state
 
+    bool               bShowTeamChange;            //!< if true -> show team change dialog
+
     OrxGui::GLGuiBox* box;
-
-
+    
     void calculateTeamScore();
     void nextGameState();
@@ -87 +92 @@
     void onButtonTeam0();
     void onButtonTeam1();
+    void onButtonCancel();
     void onButtonExit();
 };