Changeset 3209 in orxonox.OLD for orxonox/trunk

Timestamp:

Dec 18, 2004, 12:25:27 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: resolving segfault on map-change and game-end - yea - major master step

Location:

orxonox/trunk/src

Files:

• campaign.cc (modified) (1 diff)
• player.cc (modified) (4 diffs)
• world.cc (modified) (2 diffs)

orxonox/trunk/src/campaign.cc

@@ -101 +101 @@
       se = this->getStoryEntity(nextWorldID);
       if(se == NULL)
-        printf("Campaign::start() - ERROR: world it not found, oh oh...");
+        printf("Campaign::start() - ERROR: world not found, oh oh...\n");
     }
 }

orxonox/trunk/src/player.cc

@@ -27 +27 @@
 
   this->obj = new Object ("reaplow.obj");
-  /*
+  
   objectList = glGenLists(1);
   glNewList (objectList, GL_COMPILE);
@@ -51 +51 @@
   
   glEndList ();
-  */
+  
 }
 
@@ -72 +72 @@
 void Player::tick (float time)
 {
-        // movement
-        move (time);
+  // movement
+  move (time);
 }
 
@@ -111 +111 @@
   glRotatef (-90, 0,1,0);
   obj->draw();
-  //  glCallList (objectList);
+  // glCallList (objectList);
 
   

orxonox/trunk/src/world.cc

@@ -509 +509 @@
     }
 
-  for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
+  //for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
 }
 
@@ -580 +580 @@
       display();
   
-      //for(int i = 0; i < 1000000; i++){}
+      for(int i = 0; i < 1000000; i++){}
 
     }