Changeset 9347 in orxonox.OLD for branches/proxy/src/world_entities/space_ships/space_ship.cc

Timestamp:

Jul 20, 2006, 11:43:27 AM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: merged the proxy.old back again, and it seems to work.

Merged with command
svn merge -r9247:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy.old .

no conflicts

File:

• branches/proxy/src/world_entities/space_ships/space_ship.cc (modified) (1 diff)

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

@@ -314 +314 @@
   if( entity->isA(CL_PROJECTILE) && entity != ref)
   {
-    if ( isServer() )
+    if ( SharedNetworkData::getInstance()->isMasterServer() )
     {
       //TODO handle this