Changeset 9003 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Jul 2, 2006, 1:36:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

File:

• trunk/src/world_entities/world_entity.cc (modified) (3 diffs)

trunk/src/world_entities/world_entity.cc

@@ -72 +72 @@
 
   this->objectListNumber = OM_INIT;
+  this->lastObjectListNumber = OM_INIT;
   this->objectListIterator = NULL;
 
@@ -78 +79 @@
     this->collisionHandles[i] = NULL;
   this->bReactive = false;
+  this->bOnGround = false;
 
   // registering default reactions:
@@ -613 +615 @@
     }
 
-    if( this->aabbNode != NULL)
-      this->aabbNode->drawBV(0, DRAW_BV_POLYGON, Vector(1, 0.6, 0.2), true);
+//     if( this->aabbNode != NULL)
+//       this->aabbNode->drawBV(0, DRAW_BV_POLYGON, Vector(1, 0.6, 0.2), true);
 
     glPopMatrix();