Changeset 7919 in orxonox.OLD for trunk/src/story_entities/game_world.h

Timestamp:

May 28, 2006, 3:48:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

• trunk/src/story_entities/game_world.h (modified) (1 diff)

trunk/src/story_entities/game_world.h

@@ -93 +93 @@
 
     /* world timing */
-    Uint32              lastFrame;                    //!< last time of frame (in MiliSeconds)
+    double              lastFrame;                    //!< last time of frame (in MiliSeconds)
     Uint32              cycle;                        //!< The cycle we are in (starts with 0 and rises with every frame)
     float               dtS;                          //!< The time needed for caluculations in seconds
     float               speed;                        //!< how fast the game flows
     double              gameTime;                     //!< this is where the game time is saved
-    Uint32              frameTimes[TICK_SMOOTH_VALUE];//!< The time used for the last TICK_SMOOTH_VALUE's frames.
+    double              frameTimes[TICK_SMOOTH_VALUE];//!< The time used for the last TICK_SMOOTH_VALUE's frames.
 
     GameRules*          gameRules;                    //!< Pointer to the data structure containig the game rules