Changeset 6959 in orxonox.OLD for trunk/src/lib/network/network_game_manager.cc

Timestamp:

Feb 1, 2006, 4:40:34 PM (18 years ago)

Author:

patrick

Message:

trunk: merged network branche into trunk

File:

• trunk/src/lib/network/network_game_manager.cc (modified) (6 diffs)

trunk/src/lib/network/network_game_manager.cc

@@ -29 +29 @@
 #include "world_entity.h"
 #include "playable.h"
+#include "space_ships/space_ship.h"
 #include "player.h"
-#include "network_manager.h"
+#include "shared_network_data.h"
 
 #include "class_list.h"
@@ -541 +542 @@
     if ( b->isA(CL_WORLD_ENTITY) && !b->isA(CL_PLAYABLE) )
     {
-      if ( NetworkManager::getInstance()->getHostID()!=0 )
+      if ( SharedNetworkData::getInstance()->getHostID()!=0 )
       {
         static Vector pos = Vector(1000.0, 1000.0, 1000.0);
@@ -550 +551 @@
       }
     }
+    ///HACK this is only for network multiplayer games.
+    if( b->isA(CL_SPACE_SHIP))
+    {
+      SpaceShip* ss = dynamic_cast<SpaceShip*>(b);
+      if( owner%2 == 0)
+      {
+
+        ss->loadModel("models/ships/reap_#.obj");
+        ss->toList(OM_GROUP_00);
+      }
+      else
+      {
+        ss->loadModel( "models/ships/fighter.obj" );
+        ss->toList(OM_GROUP_01);
+      }
+    }
 
     return b;
@@ -576 +593 @@
     {
       assert((*it)->isA(CL_WORLD_ENTITY));
+      dynamic_cast<WorldEntity*>(*it)->leaveWorld();
       dynamic_cast<WorldEntity*>(*it)->toList(OM_DEAD);
       break;
@@ -895 +913 @@
   i += Converter::byteArrayToInt( &data[i], &uniqueID );
 
+  PRINTF(0)("handleRequestSync %d %d\n", uniqueID, sender);
   doRequestSync( uniqueID, sender );
 
@@ -980 +999 @@
 void NetworkGameManager::executeRequestSync( int uniqueID, int user )
 {
+  PRINTF(0)("executeRequestSync %d %d\n", uniqueID, user);
   if ( user >= outBuffer.size() )
     resizeBufferVector( user );