Changeset 2640 in orxonox.OLD for orxonox/trunk/src/world.h

Timestamp:

Oct 25, 2004, 2:01:06 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk/src - BUGFIX: input node now redirected to the right story_entity. This should fix the display player visibility problem, encountered on some systems

File:

• orxonox/trunk/src/world.h (modified) (4 diffs)

orxonox/trunk/src/world.h

@@ -68 +68 @@
   int debugWorldNr;
 
+  WorldEntity* localPlayer;
+  
   void mainLoop();
   void synchronize();
@@ -74 +76 @@
   void collision();
   void display();
+  void debug();
 };
 
@@ -89 +92 @@
 template<typename T> T* World::spawn(Location* loc = NULL, WorldEntity* owner = NULL)
 {
-        Location zeroloc;
-        T* entity = new T();
-        entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
-        if( loc == NULL)
-        {
-          zeroloc.dist = 0;
-          zeroloc.part = 0;
-                zeroloc.pos = Vector();
-                zeroloc.rot = Quaternion();
-                loc = &zeroloc;
-        }
-        entity->init (loc, owner);
-        if (entity->bFree)
-        {
-                track[loc->part].map_coords( loc, entity->get_placement());
-        }
-        entity->post_spawn ();
-        return entity;
+  Location zeroloc;
+  T* entity = new T();
+  entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
+  if( loc == NULL)
+    {
+      zeroloc.dist = 0;
+      zeroloc.part = 0;
+      zeroloc.pos = Vector();
+      zeroloc.rot = Quaternion();
+      loc = &zeroloc;
+    }
+  entity->init (loc, owner);
+  if (entity->bFree)
+    {
+      track[loc->part].map_coords( loc, entity->get_placement());
+    }
+  entity->post_spawn ();
+  return entity;
 }
 
@@ -123 +126 @@
 template<typename T> T* World::spawn(Placement* plc, WorldEntity* owner = NULL)
 {
-        T* entity = new T();
-        entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
-        entity->init (plc, owner);
-        if (!entity->bFree)
-        {
-                printf("Can't spawn unfree entity with placement\n"); 
-                entities->remove( (WorldEntity*)entity, LIST_FIND_FW);
-                return NULL;
-        }
-        entity->post_spawn ();
-        return entity;
+  T* entity = new T();
+  entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
+  entity->init (plc, owner);
+  if (!entity->bFree)
+    {
+      printf("Can't spawn unfree entity with placement\n"); 
+      entities->remove( (WorldEntity*)entity, LIST_FIND_FW);
+      return NULL;
+    }
+  entity->post_spawn ();
+  return entity;
 }