Changeset 9656 in orxonox.OLD for trunk/src/world_entities/playable.h

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

• trunk/src/world_entities/playable.h (modified) (7 diffs)

trunk/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
@@ -62 +64 @@
   inline const std::vector<int>& getEventList() { return this->events; };
 
+
   // Camera and Playmode
   void attachCamera();
@@ -72 +75 @@
   void setPlayDirection(float angle, float dirX, float dirY, float dirZ, float speed = 0.0f);
 
+  // Networking interface
   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; };
@@ -85 +93 @@
   virtual void tick(float dt);
 
+
+  inline bool beFire() const { return this->bFire; }
+  inline void fire(bool bF) { this->bFire = bF;}
+
   // Transformations:
   static Playable::Playmode stringToPlaymode(const std::string& playmode);
   static const std::string& playmodeToString(Playable::Playmode playmode);
   static const std::string playmodeNames[];
-
-  inline bool beFire(){ return this->bFire; }
-  inline void fire(bool bF){ this->bFire = bF;}
 
 protected:
@@ -117 +126 @@
 
   int                   score;              //!< players score
+  int                   teamChangeHandler;  //!< handler id for team changes network sync
+  int                   teamId;             //!< id of the current team
 
   bool                  bDead;
@@ -124 +135 @@
   float                 enterRadius;        //!< How far one can be away from the Playable to enter it.
 
-  WorldEntity* collider;
+  WorldEntity*          collider;
 };