Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9911 in orxonox.OLD for branches/network


Ignore:
Timestamp:
Nov 1, 2006, 2:22:00 PM (18 years ago)
Author:
rennerc
Message:

enabled playing for server

Location:
branches/network/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/util/multiplayer_team_deathmatch.cc

    r9907 r9911  
    148148      box->setAbsCoor2D( 300, 100 );
    149149
    150       if( SharedNetworkData::getInstance()->isClient() ||  SharedNetworkData::getInstance()->isProxyServerActive())
    151       {
    152         OrxGui::GLGuiPushButton * buttonSpectator = new OrxGui::GLGuiPushButton("Spectator");
    153         box->pack( buttonSpectator );
    154         buttonSpectator->released.connect(this, &MultiplayerTeamDeathmatch::onButtonSpectator);
    155 
    156         OrxGui::GLGuiPushButton * buttonRandom = new OrxGui::GLGuiPushButton("Random");
    157         box->pack( buttonRandom );
    158         buttonRandom->released.connect(this, &MultiplayerTeamDeathmatch::onButtonRandom);
    159 
    160         OrxGui::GLGuiPushButton * buttonTeam0 = new OrxGui::GLGuiPushButton("Blue Team");
    161         box->pack( buttonTeam0 );
    162         buttonTeam0->released.connect(this, &MultiplayerTeamDeathmatch::onButtonTeam0);
    163 
    164         OrxGui::GLGuiPushButton * buttonTeam1 = new OrxGui::GLGuiPushButton("Red Team");
    165         box->pack( buttonTeam1 );
    166         buttonTeam1->released.connect(this, &MultiplayerTeamDeathmatch::onButtonTeam1);
    167       }
    168       else
    169       {
    170         OrxGui::GLGuiText* text = new OrxGui::GLGuiText();
    171         text->setText("Server Mode: not able to play at this node");
    172         box->pack( text);
    173       }
    174 
     150      OrxGui::GLGuiPushButton * buttonSpectator = new OrxGui::GLGuiPushButton("Spectator");
     151      box->pack( buttonSpectator );
     152      buttonSpectator->released.connect(this, &MultiplayerTeamDeathmatch::onButtonSpectator);
     153
     154      OrxGui::GLGuiPushButton * buttonRandom = new OrxGui::GLGuiPushButton("Random");
     155      box->pack( buttonRandom );
     156      buttonRandom->released.connect(this, &MultiplayerTeamDeathmatch::onButtonRandom);
     157
     158      OrxGui::GLGuiPushButton * buttonTeam0 = new OrxGui::GLGuiPushButton("Blue Team");
     159      box->pack( buttonTeam0 );
     160      buttonTeam0->released.connect(this, &MultiplayerTeamDeathmatch::onButtonTeam0);
     161
     162      OrxGui::GLGuiPushButton * buttonTeam1 = new OrxGui::GLGuiPushButton("Red Team");
     163      box->pack( buttonTeam1 );
     164      buttonTeam1->released.connect(this, &MultiplayerTeamDeathmatch::onButtonTeam1);
    175165
    176166      if ( bShowTeamChange )
     
    307297
    308298  if ( team == 0 || team == 1 )
    309     return ObjectListBase::retrieveIdentity("TurbineHover");
     299    return ObjectListBase::retrieveIdentity("FPSPlayer");
    310300
    311301  assert( false );
  • branches/network/src/world_entities/creatures/fps_player.cc

    r9869 r9911  
    384384
    385385  // physical falling of the player
    386   if( !this->isOnGround())
     386  if( /*FIXME for testing*/ false && !this->isOnGround())
    387387  {
    388388    this->fallVelocity += 300.0f * time;
Note: See TracChangeset for help on using the changeset viewer.