Changeset 9507 in orxonox.OLD

Timestamp:

Jul 27, 2006, 1:59:30 PM (18 years ago)

Author:

patrick

Message:

the player team change should now work on all clients in the network, its now a global synch variable

Location:

branches/proxy/src

Files:

• lib/network/message_manager.h (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (2 diffs)
• lib/network/player_stats.cc (modified) (2 diffs)
• lib/network/player_stats.h (modified) (1 diff)
• world_entities/playable.cc (modified) (2 diffs)
• world_entities/playable.h (modified) (6 diffs)
• world_entities/space_ships/turbine_hover.cc (modified) (1 diff)

branches/proxy/src/lib/network/message_manager.h

@@ -26 +26 @@
 
 
+//!< different message ids
 enum MessageId
 {
-  TESTMESSAGEID = 1,
-  MSGID_DELETESYNCHRONIZEABLE,
-  MSGID_PREFEREDTEAM,
-  MSGID_CHANGENICKNAME,
-  MSGID_CHATMESSAGE,
-  MSGID_RESPAWN
+  TESTMESSAGEID                  = 1,         //!< for testing purposes
+  MSGID_DELETESYNCHRONIZEABLE,                //!< message for sync deletion
+  MSGID_PREFEREDTEAM,                         //!< change prefered team
+  MSGID_CHANGENICKNAME,                       //!< change nicknames
+  MSGID_CHATMESSAGE,                          //!< chat message
+  MSGID_RESPAWN,                              //!< respawn message
+
+  MSGID_FORWARDMESSAGE                        //!< forwarding a messag between proxy and master server
 };
+
 
 typedef bool (*MessageCallback)( MessageId messageId, byte * data, int dataLength, void * someData, int userId );

branches/proxy/src/lib/network/network_game_manager.cc

@@ -272 +272 @@
 void NetworkGameManager::prefereTeam( int teamId )
 {
-  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
-    setPreferedTeam( SharedNetworkData::getInstance()->getHostID(), teamId );
+  if ( SharedNetworkData::getInstance()->isMasterServer() )
+    this->setPreferedTeam( SharedNetworkData::getInstance()->getHostID(), teamId );
   else
   {
@@ -280 +280 @@
     assert( Converter::intToByteArray( teamId, buf, INTSIZE) == INTSIZE );
 
-    MessageManager::getInstance()->sendMessage( MSGID_PREFEREDTEAM, buf, INTSIZE, RT_USER, 0, MP_HIGHBANDWIDTH );
+    // send this message to the master server
+    MessageManager::getInstance()->sendMessage( MSGID_PREFEREDTEAM, buf, INTSIZE, RT_USER, NET_ID_MASTER_SERVER, MP_HIGHBANDWIDTH );
   }
 }

branches/proxy/src/lib/network/player_stats.cc

@@ -107 +107 @@
     this->oldNickName = nickName;
   }
-
-  if ( std::find( id.begin(), id.end(), teamId_handle ) != id.end() )
-  {
-    PRINTF(0)("user %s joins team %i\n", this->nickName.c_str(), this->teamId);
-    this->setPreferedTeamIdHandler( this->teamId);
-  }
-
-}
-
-
-/**
- * handler for setting the prefered team id
- * @param newTeamId: the new team id
- */
-void PlayerStats::setPreferedTeamIdHandler( int newTeamId)
-{
-
-  if( this->playable == NULL)
-  {
-    PRINTF(0)("could not set prefered team, since the playable is not yet set\n");
-    return;
-  }
-
-  this->playable->setTeam(newTeamId);
 }
 
@@ -189 +165 @@
     State::getPlayer()->setPlayable( this->playable );
     // also set the team id
-    this->playable->setTeam(this->getTeamId());
   }
 

branches/proxy/src/lib/network/player_stats.h

@@ -47 +47 @@
     inline void setTeamId( int teamId ){ this->teamId = teamId; }
 
-    void setPreferedTeamIdHandler( int newTeamId);
     inline int getPreferedTeamId(){ return preferedTeamId; }
     inline void setPreferedTeamId( int preferedTeamId ) { this->preferedTeamId = preferedTeamId; }

branches/proxy/src/world_entities/playable.cc

@@ -68 +68 @@
 
 
+  this->teamChangeHandler = registerVarId( new SynchronizeableInt( &this->teamId, &this->teamId, "team-id" ) );
   registerVar( new SynchronizeableInt( &score, &score, "score" ) );
   registerVar( new SynchronizeableBool( &bFire, &bFire, "bFire", PERMISSION_OWNER));
@@ -524 +525 @@
   "FirstPerson"
 };
+
+
+/**
+ * handler for changes on registred vars
+ * @param id id's which changed
+ */
+void Playable::varChangeHandler( std::list< int > & id )
+{
+  if ( std::find( id.begin(), id.end(), this->teamChangeHandler) != id.end() )
+  {
+    this->setTeam(this->teamId);
+  }
+
+  WorldEntity::varChangeHandler(id);
+}

branches/proxy/src/world_entities/playable.h

@@ -11 +11 @@
 #include "event.h"
 #include <vector>
+#include <list>
 
 #include "world_entities/weapons/weapon_manager.h"
@@ -43 +44 @@
 
   virtual void loadParams(const TiXmlElement* root);
+  void varChangeHandler( std::list< int > & id );
 
   // Weapon and Pickups
@@ -61 +63 @@
   /** @return a List of Events in PEV_* sytle */
   inline const std::vector<int>& getEventList() { return this->events; };
-  virtual void setTeam(int teamID);
 
 
@@ -77 +78 @@
   inline void setScore( int score ) { this->score = score; }
   inline int  getScore() { return this->score; }
+  inline void setTeamId( int teamId) { this->teamId = teamId;}
+  inline int getTeamId() const { return this->teamId; }
+  virtual void setTeam(int teamID);
+
 
   void setEnterRadius(float radius) { this->enterRadius = radius; };
@@ -121 +126 @@
 
   int                   score;              //!< players score
+  int                   teamChangeHandler;  //!< handler id for team changes network sync
+  int                   teamId;             //!< id of the current team
 
   bool                  bDead;
@@ -128 +135 @@
   float                 enterRadius;        //!< How far one can be away from the Playable to enter it.
 
-  WorldEntity* collider;
+  WorldEntity*          collider;
 };
 

branches/proxy/src/world_entities/space_ships/turbine_hover.cc

@@ -276 +276 @@
   else if (teamID == 1)
     this->setBoostColor(Color::red);
+
+  // set the local team id, very important
+  this->setTeamId(teamID);
 }