Changeset 6160 for code/branches/presentation2/src/orxonox

Timestamp:

Nov 26, 2009, 2:11:48 PM (15 years ago)

Author:

scheusso

Message:

server may now pause/slow the game (also on clients) with commands setTimeFactor & pause

Location:

code/branches/presentation2/src/orxonox/gamestates

Files:

• GSRoot.cc (modified) (6 diffs)
• GSRoot.h (modified) (1 diff)

code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc

@@ -45 +45 @@
     GSRoot::GSRoot(const GameStateInfo& info)
         : GameState(info)
-        , timeFactor_(1.0f)
         , bPaused_(false)
         , timeFactorPauseBackup_(1.0f)
@@ -73 +72 @@
     {
         // reset game speed to normal
-        this->timeFactor_ = 1.0f;
+        TimeFactorListener::setTimeFactor(1.0f);
 
         // time factor console command
@@ -102 +101 @@
         }
         for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; )
-            (it++)->tick(leveldt * this->timeFactor_);
+            (it++)->tick(leveldt * TimeFactorListener::getTimeFactor());
         /*** HACK *** HACK ***/
     }
@@ -119 +118 @@
             if (!this->bPaused_)
             {
-                TimeFactorListener::timefactor_s = factor;
-
-                for (ObjectList<TimeFactorListener>::iterator it = ObjectList<TimeFactorListener>::begin(); it != ObjectList<TimeFactorListener>::end(); ++it)
-                    it->changedTimeFactor(factor, this->timeFactor_);
-
-                this->timeFactor_ = factor;
+                TimeFactorListener::setTimeFactor(factor);
             }
             else
@@ -137 +131 @@
             if (!this->bPaused_)
             {
-                this->timeFactorPauseBackup_ = this->timeFactor_;
+                this->timeFactorPauseBackup_ = TimeFactorListener::getTimeFactor();
                 this->setTimeFactor(0.0f);
                 this->bPaused_ = true;
@@ -148 +142 @@
         }
     }
+
+    float GSRoot::getTimeFactor()
+    {
+        return TimeFactorListener::getTimeFactor();
+    }
 }

code/branches/presentation2/src/orxonox/gamestates/GSRoot.h

@@ -51 +51 @@
         void setTimeFactor(float factor);
         void pause();
-        float getTimeFactor() { return this->timeFactor_; }
+        float getTimeFactor();
 
     private:
-        float                 timeFactor_;              //!< A factor that sets the gamespeed. 1 is normal.
         bool                  bPaused_;
         float                 timeFactorPauseBackup_;