Changeset 9406 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:

trunk/src/world_entities/space_ships

Files:

• collision_probe.cc (modified) (1 diff)
• space_ship.cc (modified) (2 diffs)
• spacecraft_2d.cc (modified) (2 diffs)

trunk/src/world_entities/space_ships/collision_probe.cc

@@ -24 +24 @@
 
 
-using namespace std;
+
 
 CREATE_FACTORY(CollisionProbe, CL_COLLISION_PROBE);

trunk/src/world_entities/space_ships/space_ship.cc

@@ -52 +52 @@
 
 
-using namespace std;
+
 
 CREATE_FACTORY(SpaceShip, CL_SPACE_SHIP);
@@ -314 +314 @@
   if( entity->isA(CL_PROJECTILE) && entity != ref)
   {
-    if ( isServer() )
+    if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
     {
       //TODO handle this
     }
   }
-  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
+  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
 }
 

trunk/src/world_entities/space_ships/spacecraft_2d.cc

@@ -324 +324 @@
 
     default:
-      PRINTF(2)("Playmode %s Not Implemented in %s\n", Playable::playmodeToString(this->getPlaymode()).c_str(), this->getClassName());
+      PRINTF(2)("Playmode %s Not Implemented in %s\n", Playable::playmodeToString(this->getPlaymode()).c_str(), this->getClassCName());
   }
 }
@@ -474 +474 @@
 
     default:
-      PRINTF(2)("Playmode %s Not Implemented in %s\n", Playable::playmodeToString(this->getPlaymode()).c_str(), this->getClassName());
+      PRINTF(2)("Playmode %s Not Implemented in %s\n", Playable::playmodeToString(this->getPlaymode()).c_str(), this->getClassCName());
   }
 }