Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9499 in orxonox.OLD for branches/proxy/src


Ignore:
Timestamp:
Jul 27, 2006, 12:10:08 PM (18 years ago)
Author:
patrick
Message:

team id is supported

Location:
branches/proxy/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/network/network_game_manager.cc

    r9494 r9499  
    233233bool NetworkGameManager::preferedTeamHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
    234234{
    235   assert( SharedNetworkData::getInstance()->isMasterServer() ||  SharedNetworkData::getInstance()->isProxyServerActive());
     235  assert( SharedNetworkData::getInstance()->isMasterServer() /*||  SharedNetworkData::getInstance()->isProxyServerActive()*/);
    236236
    237237  int teamId = 0;
     
    249249}
    250250
     251
     252/**
     253 * this actualy sets the new prefered team id
     254 * @param userId: the user that changes team
     255 * @param teamId: the new team id for the user
     256 */
    251257void NetworkGameManager::setPreferedTeam( int userId, int teamId )
    252258{
     
    258264  stats.setPreferedTeamId( teamId );
    259265}
     266
    260267
    261268/**
  • branches/proxy/src/world_entities/playable.h

    r9406 r9499  
    7272  void setPlayDirection(float angle, float dirX, float dirY, float dirZ, float speed = 0.0f);
    7373
     74  // Networking interface
    7475  inline void setScore( int score ) { this->score = score; }
    7576  inline int  getScore() { return this->score; }
     77  virtual void setTeam(int teamId) {}
    7678
    7779  void setEnterRadius(float radius) { this->enterRadius = radius; };
Note: See TracChangeset for help on using the changeset viewer.