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

Timestamp:

Jun 20, 2006, 1:39:01 PM (19 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)

Location:

trunk/src/util

Files:

• game_rules.h (modified) (1 diff)
• multiplayer_team_deathmatch.cc (modified) (12 diffs)
• multiplayer_team_deathmatch.h (modified) (5 diffs)
• network_game_rules.cc (modified) (2 diffs)
• network_game_rules.h (modified) (1 diff)
• signal_handler.h (modified) (3 diffs)

trunk/src/util/game_rules.h

@@ -20 +20 @@
 
 
-class GameRules : public BaseObject
+class GameRules : virtual public BaseObject
 {
 

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -65 +65 @@
   this->currentGameState = GAMESTATE_PRE_GAME;
   this->gameStateTimer = 10.0f;
+  this->bShowTeamChange = false;
   
   this->box = NULL;
@@ -77 +78 @@
   if( root != NULL)
     this->loadParams(root);
+  
+  subscribeEvent( ES_GAME, SDLK_o );
 }
 
@@ -86 +89 @@
   if( this->deathScreen)
     delete this->deathScreen;
+  
+  unsubscribeEvent( ES_GAME, SDLK_o );
 }
 
@@ -150 +155 @@
     return;
   
-  if ( currentGameState == GAMESTATE_PRE_GAME )
+  if ( currentGameState == GAMESTATE_PRE_GAME || currentGameState == GAMESTATE_GAME )
   {
     if ( PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )
-         && PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )->getPreferedTeamId() == TEAM_NOTEAM 
          && box == NULL
+         &&  (PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )->getPreferedTeamId() == TEAM_NOTEAM 
+         || bShowTeamChange )
+         
        )
     {
@@ -180 +187 @@
       buttonTeam1->connect(SIGNAL(buttonTeam1, released), this, SLOT(MultiplayerTeamDeathmatch, onButtonTeam1));
       
+      if ( bShowTeamChange )
+      {
+        OrxGui::GLGuiPushButton * buttonCancel = new OrxGui::GLGuiPushButton("Cancel");
+        box->pack( buttonCancel );
+        buttonCancel->connect(SIGNAL(buttonCancel, released), this, SLOT(MultiplayerTeamDeathmatch, onButtonCancel));
+      }
+      
       OrxGui::GLGuiPushButton * buttonExit = new OrxGui::GLGuiPushButton("Exit");
       box->pack( buttonExit );
@@ -191 +205 @@
        && PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )
        && PlayerStats::getStats( SharedNetworkData::getInstance()->getHostID() )->getPreferedTeamId() != TEAM_NOTEAM 
+       && !bShowTeamChange
      )
   {
@@ -479 +494 @@
 {
   State::getCurrentStoryEntity()->stop();
+  this->bShowTeamChange = false;
 }
 
@@ -484 +500 @@
 {
   NetworkGameManager::getInstance()->prefereTeam( TEAM_RANDOM );
+  this->bShowTeamChange = false;
 }
 
@@ -489 +506 @@
 {
   NetworkGameManager::getInstance()->prefereTeam( 0 );
+  this->bShowTeamChange = false;
 }
 
@@ -494 +512 @@
 {
   NetworkGameManager::getInstance()->prefereTeam( 1 );
+  this->bShowTeamChange = false;
 }
 
@@ -499 +518 @@
 {
   NetworkGameManager::getInstance()->prefereTeam( TEAM_SPECTATOR );
+  this->bShowTeamChange = false;
 }
 
@@ -507 +527 @@
 }
 
-
-
-
-
-
+  /**
+   * function that processes events from the handler
+   * @param event: the event
+   * @todo replace SDLK_o with something from KeyMapper
+   */
+void MultiplayerTeamDeathmatch::process( const Event & event )
+{
+  if ( event.type == SDLK_o )
+  {
+    if ( event.bPressed )
+      this->bShowTeamChange = true;
+  }
+}
+
+void MultiplayerTeamDeathmatch::onButtonCancel( )
+{
+  this->bShowTeamChange = false;
+}
+
+
+
+/**
+ * this method is called by NetworkGameManger when he recieved a chat message
+ * @param userId senders user id
+ * @param message message string
+ * @param messageType some int
+ */
+void MultiplayerTeamDeathmatch::handleChatMessage( int userId, const std::string & message, int messageType )
+{
+  std::string name = "unknown";
+  
+  if ( PlayerStats::getStats( userId ) )
+  {
+    name = PlayerStats::getStats( userId )->getNickName();
+  }
+  
+  PRINTF(0)("CHATMESSAGE %s: %s\n", name.c_str(), message.c_str() );
+}
+
+
+
+

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();
 };

trunk/src/util/network_game_rules.cc

@@ -17 +17 @@
 
 #include "network_game_rules.h"
+
+#include "network_game_manager.h"
 
 using namespace std;
@@ -53 +55 @@
 }
 
+
+void NetworkGameRules::shellSay( const std::string & message )
+{
+  NetworkGameManager::getInstance()->sendChatMessage( message, 0 );
+}
+
+

trunk/src/util/network_game_rules.h

@@ -25 +25 @@
     
     virtual PlayerStats * getNewPlayerStats( int userId ){ return new PlayerStats( userId ); }
+    
+    virtual void handleChatMessage( int userId, const std::string & message, int messageType ) = 0;
+    
+    void shellSay( const std::string & message );
 
 

trunk/src/util/signal_handler.h

@@ -17 +17 @@
 };
 
-typedef bool (*SignalCallback)( void * someData );
+typedef int (*SignalCallback)( void * someData );
 
 #ifndef __WIN32__
@@ -44 +44 @@
   public:
     inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; }
-      
+
     void registerCallback( SignalCallback cb, void * someData );
 
@@ -55 +55 @@
     void catchSignal( int sig );
     SignalRecList sigRecList;
-    
+
     SignalCallbackList callbackList;