Changeset 8147 in orxonox.OLD for trunk/src/util/network_game_rules.h

Timestamp:

Jun 5, 2006, 12:09:15 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8070:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
no conflicts

File:

• trunk/src/util/network_game_rules.h (modified) (1 diff)

trunk/src/util/network_game_rules.h

@@ -21 +21 @@
     
     virtual int getTeamForNewUser();
-    virtual ClassID getPlayableClassId( int team );
-    virtual std::string getPlayableModelFileName( int team, ClassID classId );
+    virtual ClassID getPlayableClassId( int userId, int team );
+    virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
     
     virtual PlayerStats * getNewPlayerStats( int userId ){ return new PlayerStats( userId ); }