Changeset 9656 in orxonox.OLD for trunk/src/lib/network/player_stats.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/lib/network/player_stats.h (modified) (3 diffs)

trunk/src/lib/network/player_stats.h

@@ -16 +16 @@
 enum
 {
-  TEAM_NOTEAM = -3,
-  TEAM_RANDOM = -2,
-  TEAM_SPECTATOR = -1
+  TEAM_NOTEAM       = -3,
+  TEAM_RANDOM       = -2,
+  TEAM_SPECTATOR    = -1
 };
+
 
 struct PlayerScore
@@ -26 +27 @@
   int score;
 };
+
+
 typedef std::list<PlayerScore> TeamScoreList;
 typedef std::map<int,TeamScoreList> ScoreList;
 
+
 //! A class for storing player information
-class PlayerStats : public Synchronizeable 
+class PlayerStats : public Synchronizeable
 {
 
@@ -37 +41 @@
     PlayerStats( int userId );
     virtual ~PlayerStats();
-    
+
     virtual void varChangeHandler( std::list<int> & id );
-    
+
     static PlayerStats * getStats( int userId );
-    
-    inline int getUserId(){ return userId; }
-    
+    inline int getAssignedUserId(){ return this->assignedUserId; }
+
+
     inline int getTeamId(){ return teamId; }
     inline void setTeamId( int teamId ){ this->teamId = teamId; }
-    
+
     inline int getPreferedTeamId(){ return preferedTeamId; }
-    inline void setPreferedTeamId( int preferedTeamId ){ this->preferedTeamId = preferedTeamId; }
-    
+    inline void setPreferedTeamId( int preferedTeamId ) { this->preferedTeamId = preferedTeamId; }
+
     inline int getScore(){ return score; }
     inline void setScore( int score ){ this->score = score; }
-    
+
     inline int getPlayableClassId(){ return playableClassId; }
     void setPlayableClassId( int classId ){ this->playableClassId = classId; };
-    
+
     inline int getPlayableUniqueId(){ return playableUniqueId; }
     void setPlayableUniqueId( int uniqueId );
-    
+
     inline std::string getModelFileName(){ return modelFileName; }
     inline void setModelFileName( std::string filename ){ modelFileName = filename; }
-    
+
     Playable * getPlayable();
-    
+
     inline std::string getNickName(){ return this->nickName; }
     void setNickName( std::string nick );
-    static bool changeNickHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId );
+    static bool changeNickHandler( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  );
     void shellNick( const std::string&  newNick );
-    
+
     static void deleteAllPlayerStats();
-    
+
     static ScoreList getScoreList();
 
+
   private:
-    int userId;                //!< userId
-    int teamId;                //!< teamId
-    int preferedTeamId;        //!< preferedTeamId
+    void init();
 
-    std::string nickName;      //!< players nickname
-    std::string oldNickName;   //!< nickname player had before
 
-    int score;                 //!< users score points
-    int playableClassId;       //!< players playable class id
-    int playableUniqueId;      //!< playable's uniqueId
-    std::string modelFileName; //!< model filename
+  private:
+    // handles for SynchronizeableVars
+    int              userId_handle;
+    int              teamId_handle;
+    int              preferedTeamId_handle;
+    int              score_handle;
+    int              playableClassId_handle;
+    int              playableUniqueId_handle;
+    int              modelFileName_handle;
+    int              nickName_handler;
 
-    Playable * playable;       //!< pointer to players playable
+    int              assignedUserId;            //!< userId
+    int              teamId;                    //!< teamId
+    int              preferedTeamId;            //!< preferedTeamId
 
-    // handles for SynchronizeableVars
-    int userId_handle;
-    int teamId_handle;
-    int preferedTeamId_handle;
-    int score_handle;
-    int playableClassId_handle;
-    int playableUniqueId_handle;
-    int modelFileName_handle;
-    int nickName_handler;
-    
-    void init();
+    std::string      nickName;                  //!< players nickname
+    std::string      oldNickName;               //!< nickname player had before
+
+    int              score;                     //!< users score points
+    int              playableClassId;           //!< players playable class id
+    int              playableUniqueId;          //!< playable's uniqueId
+    std::string      modelFileName;             //!< model filename
+
+    Playable *       playable;                  //!< pointer to players playable
 };