Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jun 5, 2006, 12:09:15 PM (19 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/util/network_game_rules.cc

    r8068 r8147  
    3838}
    3939
    40 std::string NetworkGameRules::getPlayableModelFileName( int team, ClassID classId )
     40std::string NetworkGameRules::getPlayableModelFileName( int uesrId, int team, ClassID classId )
    4141{
    4242  return "models/ships/reap_#.obj";
    4343}
    4444
    45 ClassID NetworkGameRules::getPlayableClassId( int team )
     45ClassID NetworkGameRules::getPlayableClassId( int userId, int team )
    4646{
    4747  return CL_SPACE_SHIP;
Note: See TracChangeset for help on using the changeset viewer.