Changeset 9470 in orxonox.OLD for branches/proxy/src/world_entities

Timestamp:

Jul 25, 2006, 10:23:17 PM (18 years ago)

Author:

patrick

Message:

heavy permissions fight: no node was ever thought to be client and server at the same time, proxy server are hybrid nodes so there is need for a big framework extension.

• made the obb creation saver
• prevented segfaults in the aabb tree creation, this was very dangerous code
• inserted handshake hack to make the handshake work.

No I will have to get the handshake right so the node works correctly

Location:

branches/proxy/src/world_entities

Files:

• creatures/fps_player.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)
• world_entity.cc (modified) (2 diffs)

branches/proxy/src/world_entities/creatures/fps_player.cc

@@ -287 +287 @@
   //dealing damage
 
-  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive()))
+  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/))
   {
     this->damageTicker -= time;

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

@@ -310 +310 @@
 void SpaceShip::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  Playable::collidesWith(entity, location);
-
-  if( entity->isA(CL_PROJECTILE) && entity != ref)
-  {
-    if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
-    {
-      //TODO handle this
-    }
-  }
-  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
+
 }
 

branches/proxy/src/world_entities/world_entity.cc

@@ -257 +257 @@
 bool WorldEntity::buildObbTree(int depth)
 {
-  if (this->obbTree)
+  if( this->obbTree != NULL)
+  {
     delete this->obbTree;
+    this->obbTree = NULL;
+  }
 
   if (this->models[0] != NULL)
@@ -280 +283 @@
     this->aabbNode = new AABBTreeNode();
     this->aabbNode->spawnBVTree(this->models[0]);
+  }
+  else
+  {
+    PRINTF(1)("could not create aabb bounding box, because no model was loaded yet\n");
+    this->aabbNode = NULL;
+    return false;
   }
   return true;