Changeset 9643 in orxonox.OLD

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:

• lib/network/monitor/network_monitor.cc (modified) (1 diff)
• lib/network/network_stream.cc (modified) (1 diff)
• world_entities/space_ships/turbine_hover.cc (modified) (3 diffs)
• world_entities/space_ships/turbine_hover.h (modified) (1 diff)

branches/proxy/src/lib/network/monitor/network_monitor.cc

@@ -67 +67 @@
       PeerInfo* peer = new PeerInfo();
       peer->ip = (*it);
-      peer->nodeType = NET_PROXY_SERVER_ACTIVE;
+      peer->nodeType = NET_PROXY_SERVER_PASSIVE;
       peer->userId = -1;
 

branches/proxy/src/lib/network/network_stream.cc

@@ -106 +106 @@
 
   // get the local ip address
-  IPaddress ip;
-  SDLNet_ResolveHost( &ip, NULL, 0);
+  IP ip("localhost", 0);
   this->pInfo->ip = ip;
 }

branches/proxy/src/world_entities/space_ships/turbine_hover.cc

@@ -91 +91 @@
 
   this->loadModel("models/ships/hoverglider_mainbody.obj");
+
 }
 
@@ -222 +223 @@
   registerVar( new SynchronizeableFloat( &cameraLook, &cameraLook, "cameraLook", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) );
+
+  if( State::isOnline())
+    toList( OM_PLAYERS );
 }
 
@@ -552 +556 @@
   }
 }
+
+
+/**
+ *  respawning function called by the GameRules
+ */
+void TurbineHover::respawn( )
+{
+  if( State::isOnline())
+    toList( OM_PLAYERS );
+
+//   this->damageTicker = 0.0f;
+
+  Playable::respawn();
+}

branches/proxy/src/world_entities/space_ships/turbine_hover.h

@@ -34 +34 @@
     virtual void postSpawn();
     virtual void leftWorld();
+    virtual void respawn();
 
     virtual void collidesWith(WorldEntity* entity, const Vector& location);