Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9643 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 31, 2006, 11:03:04 AM (18 years ago)
Author:
patrick
Message:

localhost now gets its own ip, hoover is added to the correct team

Location:
branches/proxy/src
Files:
4 edited

Legend:

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

    r9637 r9643  
    6767      PeerInfo* peer = new PeerInfo();
    6868      peer->ip = (*it);
    69       peer->nodeType = NET_PROXY_SERVER_ACTIVE;
     69      peer->nodeType = NET_PROXY_SERVER_PASSIVE;
    7070      peer->userId = -1;
    7171
  • branches/proxy/src/lib/network/network_stream.cc

    r9638 r9643  
    106106
    107107  // get the local ip address
    108   IPaddress ip;
    109   SDLNet_ResolveHost( &ip, NULL, 0);
     108  IP ip("localhost", 0);
    110109  this->pInfo->ip = ip;
    111110}
  • branches/proxy/src/world_entities/space_ships/turbine_hover.cc

    r9507 r9643  
    9191
    9292  this->loadModel("models/ships/hoverglider_mainbody.obj");
     93
    9394}
    9495
     
    222223  registerVar( new SynchronizeableFloat( &cameraLook, &cameraLook, "cameraLook", PERMISSION_OWNER ) );
    223224  registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) );
     225
     226  if( State::isOnline())
     227    toList( OM_PLAYERS );
    224228}
    225229
     
    552556  }
    553557}
     558
     559
     560/**
     561 *  respawning function called by the GameRules
     562 */
     563void TurbineHover::respawn( )
     564{
     565  if( State::isOnline())
     566    toList( OM_PLAYERS );
     567
     568//   this->damageTicker = 0.0f;
     569
     570  Playable::respawn();
     571}
  • branches/proxy/src/world_entities/space_ships/turbine_hover.h

    r9500 r9643  
    3434    virtual void postSpawn();
    3535    virtual void leftWorld();
     36    virtual void respawn();
    3637
    3738    virtual void collidesWith(WorldEntity* entity, const Vector& location);
Note: See TracChangeset for help on using the changeset viewer.