Changeset 9691 in orxonox.OLD for branches/new_class_id/src/util

Timestamp:

Aug 22, 2006, 11:45:21 PM (18 years ago)

Author:

bensch

Message:

new_class_id: adapted Network

Location:

branches/new_class_id/src/util

Files:

• multiplayer_team_deathmatch.h (modified) (5 diffs)
• network_game_rules.h (modified) (1 diff)

branches/new_class_id/src/util/multiplayer_team_deathmatch.h

@@ -38 +38 @@
 
     virtual int getTeamForNewUser();
-    virtual ClassID getPlayableClassId( int userId, int team );
-    virtual std::string getPlayableModelTextureFileName( int userId, int team, ClassID classId );
-    virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
-    virtual float getPlayableScale( int userId, int team, ClassID classId );
+    virtual const NewClassID& getPlayableClassId( int userId, int team );
+    virtual std::string getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId );
+    virtual std::string getPlayableModelFileName( int userId, int team, const NewClassID& classId );
+    virtual float getPlayableScale( int userId, int team, const NewClassID& classId );
 
     virtual void registerSpawn( WorldEntity * we );
@@ -50 +50 @@
     inline void setDeathPenaltyTimeout(float time) { this->deathTimeout = time; }
     inline void setMaxKills(int kills) { this->maxKills = kills; }
-    
+
     inline void setNumTeams( int numTeams ){ this->numTeams = numTeams; }
     inline int getNumTeams(){ return this->numTeams; }
-    
+
     int getRandomTeam();
-    
+
     virtual void process(const Event &event);
-    
+
     void onKill( WorldEntity * victim, WorldEntity * killer );
     void onRespawn( int userId );
-    
+
     virtual void handleChatMessage( int userId, const std::string & message, int messageType );
-    
+
     void respawnPlayable( Playable * playable, int teamId, float delay );
 
@@ -84 +84 @@
 
     OrxGui::GLGuiBox* box;
-    
+
     OrxGui::GLGuiInputLine* input;
-    
+
     void calculateTeamScore();
     void nextGameState();
@@ -92 +92 @@
     void teamChange( int userId );
     void assignPlayable();
-    
+
     void onButtonSpectator();
     void onButtonRandom();
@@ -99 +99 @@
     void onButtonCancel();
     void onButtonExit();
-    
+
     void onInputEnter( const std::string & text );
-    
+
     OrxGui::GLGuiBox* statsBox;
     OrxGui::GLGuiTable* table;
     void tickStatsTable();
-    
+
     void showStats();
     void hideStats();

branches/new_class_id/src/util/network_game_rules.h

@@ -19 +19 @@
     NetworkGameRules( const TiXmlElement* root );
     virtual ~NetworkGameRules();
-    
+
     virtual int getTeamForNewUser();
-    virtual ClassID getPlayableClassId( int userId, int team );
-    virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
-    virtual std::string getPlayableModelTextureFileName( int userId, int team, ClassID classId );
-    virtual float getPlayableScale( int userId, int team, ClassID classId );
-    
+    virtual const NewClassID& getPlayableClassId( int userId, int team );
+    virtual std::string getPlayableModelFileName( int userId, int team, const NewClassID& classId );
+    virtual std::string getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId );
+    virtual float getPlayableScale( int userId, int team, const NewClassID& classId );
+
     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 );