Changeset 2644 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Oct 25, 2004, 4:26:40 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: BUGFIX - Player spawn problem resolved (I hope…)

Location:

orxonox/trunk/src

Files:

• error.h (modified) (1 diff)
• world.cc (modified) (4 diffs)
• world.h (modified) (1 diff)

orxonox/trunk/src/error.h

@@ -24 +24 @@
 // this are the two undefined error nr. Don't use them ...
 #define ERROR -1
-#define NO_ERROR 0
+#define NERROR 0
 
 /*!

orxonox/trunk/src/world.cc

@@ -51 +51 @@
 {
   Orxonox *orx = Orxonox::getInstance();
-  orx->get_localinput()->unbind (localPlayer);
-  delete entities;
+  orx->get_localinput()->unbind (this->localPlayer);
+  delete this->entities;
+  delete this->localCamera;
 }
 
@@ -112 +113 @@
             
             // create a player
-            WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();
+            //WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();
+            WorldEntity* myPlayer = new Player();
+            this->spawn(myPlayer);
             this->localPlayer = myPlayer;           
 
@@ -144 +147 @@
             
             // create a player
-            WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();
+            //WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();
+            WorldEntity* myPlayer = new Player();
+            this->spawn(myPlayer);
             this->localPlayer = myPlayer;
             
@@ -527 +532 @@
   return this->localCamera;
 }
+
+
+void World::spawn(WorldEntity* entity)
+{
+  Location zeroloc;
+  Location* loc = NULL;
+  WorldEntity* owner;
+  //T* entity = new T();
+  entities->add (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)
+    {
+      this->track[loc->part].map_coords( loc, entity->get_placement());
+    }
+  entity->post_spawn ();
+  //return entity;
+}

orxonox/trunk/src/world.h

@@ -50 +50 @@
   Camera* getCamera();
   //private:
-  
+
+  void spawn(WorldEntity* entity);
+
   List<WorldEntity>* entities;