Changeset 1755 for code/trunk/src/orxonox/gamestates/GSLevel.cc

Timestamp:

Sep 10, 2008, 1:37:36 AM (16 years ago)

Author:

rgrieder

Message:

merged gui back to trunk.
update the media repository!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates (copied) (copied from code/branches/gui/src/orxonox/gamestates)
• src/orxonox/gamestates/GSLevel.cc (copied) (copied from code/branches/gui/src/orxonox/gamestates/GSLevel.cc) (3 diffs)

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -86 +86 @@
         // reset game speed to normal
         timeFactor_ = 1.0f;
+
+        // TODO: insert slomo console command with
+        // .accessLevel(AccessLevel::Offline).defaultValue(0, 1.0).axisParamIndex(0).isAxisRelative(false);
     }
 
@@ -111 +114 @@
     {
         // Call those objects that need the real time
-        for (Iterator<TickableReal> it = ObjectList<TickableReal>::start(); it; ++it)
+        for (ObjectList<TickableReal>::iterator it = ObjectList<TickableReal>::begin(); it; ++it)
             it->tick(time.getDeltaTime());
         // Call the scene objects
-        for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
+        for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)
             it->tick(time.getDeltaTime() * this->timeFactor_);
 
-        for (Iterator<TimerBase> it = ObjectList<TimerBase>::start(); it; ++it)
+        for (ObjectList<TimerBase>::iterator it = ObjectList<TimerBase>::begin(); it; ++it)
             it->tick(time);
     }
@@ -129 +132 @@
         float change = factor / this->timeFactor_;
         this->timeFactor_ = factor;
-        for (Iterator<ParticleInterface> it = ObjectList<ParticleInterface>::begin(); it; ++it)
+        for (ObjectList<ParticleInterface>::iterator it = ObjectList<ParticleInterface>::begin(); it; ++it)
             it->setSpeedFactor(it->getSpeedFactor() * change);
 
-        for (Iterator<Backlight> it = ObjectList<Backlight>::begin(); it; ++it)
+        for (ObjectList<Backlight>::iterator it = ObjectList<Backlight>::begin(); it; ++it)
             it->setTimeFactor(timeFactor_);
     }