Changeset 4885 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Jul 18, 2005, 3:36:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the weaponSystem back to the trunk, because it seems safe
merged with command:
svn merge -r 4847:HEAD branches/weaponSystem/ trunk/
conflict in file src/world-entities/weapons/weapon.h resolved in favor of the weaponSystem

File:

• orxonox/trunk/src/story_entities/world.cc (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -841 +841 @@
   while( entity != NULL )
     {
-      if( entity->bDraw ) entity->draw();
+      if( entity->isVisible() ) entity->draw();
       //entity = this->entities->nextElement();
       entity = iterator->nextElement();