Changeset 6633 in orxonox.OLD for trunk

Timestamp:

Jan 21, 2006, 1:05:05 AM (19 years ago)

Author:

bensch

Message:

trunk: some minors

Location:

trunk/src

Files:

• lib/particles/particle_system.cc (modified) (1 diff)
• util/loading/resource_manager.h (modified) (2 diffs)

trunk/src/lib/particles/particle_system.cc

@@ -280 +280 @@
 void ParticleSystem::tick(float dt)
 {
-  printf("TICKED %f %d\n", dt, this->count);
   Particle* tickPart = particles;  // the particle to Tick
   Particle* prevPart = NULL;

trunk/src/util/loading/resource_manager.h

@@ -74 +74 @@
 
   // more specific
+  union {
+#ifndef NO_MODEL
   float             modelSize;         //!< the size of the model (OBJ/PRIM)
-#ifndef NO_MODEL
   char*             secFileName;       //!< a seconf fileName
 #endif /* NO_MODEL */
@@ -84 +85 @@
   GLenum            texTarget;
 #endif /* NO_TEXTURES */
+  };
 };