Changeset 10613 in orxonox.OLD

Timestamp:

Mar 30, 2007, 11:28:20 AM (17 years ago)

Author:

rennerc

Message:

allow user to use shell with high gamespeed

Location:

branches/cleanup/src

Files:

• lib/shell/shell_input.cc (modified) (2 diffs)
• story_entities/game_world.h (modified) (1 diff)

branches/cleanup/src/lib/shell/shell_input.cc

@@ -24 +24 @@
 #include "compiler.h"
 #include "key_names.h"
+
+#include "game_world.h"
+#include "state.h"
 
 
@@ -284 +287 @@
   {
     if (this->delayed > 0.0)
-      this->delayed -= dt;
+    {
+      StoryEntity* storyEntity = State::getCurrentStoryEntity();
+      float speed = 1;
+      if ( storyEntity && storyEntity->isA( GameWorld::staticClassID() ) )
+      {
+        speed = ((GameWorld*)storyEntity)->getSpeed();
+      }
+      this->delayed -= dt / speed;
+    }
     else if (this->pressedKey != SDLK_FIRST )
     {

branches/cleanup/src/story_entities/game_world.h

@@ -56 +56 @@
   inline double getGameTime() { return this->gameTime; }
   /** sets the game speed @param speed speed of the Game */
-  inline void setSpeed(float speed) { this->speed = speed; };
+  inline void setSpeed(float speed) { this->speed = speed; }
+  inline float getSpeed(){ return this->speed; }
   /**  returns the track path of this world @returns the track path */