Changeset 9507 in orxonox.OLD for branches/proxy/src/world_entities

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/world_entities

Files:

• playable.cc (modified) (2 diffs)
• playable.h (modified) (6 diffs)
• space_ships/turbine_hover.cc (modified) (1 diff)

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