[Pingus-CVS] r3612 - trunk/pingus/src

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-01 05:44:55 +0200 (Tue, 01 Jul 2008)
New Revision: 3612

Modified:
   trunk/pingus/src/game_session.cpp
   trunk/pingus/src/globals.cpp
   trunk/pingus/src/globals.hpp
   trunk/pingus/src/pingus_main.cpp
   trunk/pingus/src/pingus_options.hpp
Log:
Removed frameskip code

Modified: trunk/pingus/src/game_session.cpp
===================================================================
--- trunk/pingus/src/game_session.cpp   2008-07-01 03:40:29 UTC (rev 3611)
+++ trunk/pingus/src/game_session.cpp   2008-07-01 03:44:55 UTC (rev 3612)
@@ -134,20 +134,6 @@
       // how much time each world update represents
       int update_time = game_speed;
 
-      // this is old frameskip code that needs re-design or complete removal
-      if (0){
-        int i;
-        for (i = 0;
-             ((i * update_time < time_passed)
-              || i < min_frame_skip)
-               && !(i > max_frame_skip);
-             ++i)
-          {
-            // This updates the world and all objects
-            update_server();
-          }
-      }
-
       // update the world (and the objects in it) in constant steps to account
       // for the time the previous frame took
 

Modified: trunk/pingus/src/globals.cpp
===================================================================
--- trunk/pingus/src/globals.cpp        2008-07-01 03:40:29 UTC (rev 3611)
+++ trunk/pingus/src/globals.cpp        2008-07-01 03:44:55 UTC (rev 3612)
@@ -45,9 +45,6 @@
 bool        show_input_debug_screen         = false;
 bool        render_preview                  = false;
 
-int         min_frame_skip                  = 1;
-int         max_frame_skip                  = 5;
-
 std::string controller_file;
 
 std::string global_username;

Modified: trunk/pingus/src/globals.hpp
===================================================================
--- trunk/pingus/src/globals.hpp        2008-07-01 03:40:29 UTC (rev 3611)
+++ trunk/pingus/src/globals.hpp        2008-07-01 03:44:55 UTC (rev 3612)
@@ -66,9 +66,6 @@
 extern std::string default_language;                ///< The default language, 
which is used when the env var LANG is not set
 extern unsigned int pingus_debug_flags;              ///< Set some bits in 
this thing to get debug infos
 
-extern int         min_frame_skip;
-extern int         max_frame_skip;
-
 enum { PINGUS_DEBUG_ACTIONS     = (1 << 0),
        PINGUS_DEBUG_SOUND       = (1 << 1),
        PINGUS_DEBUG_GAMETIME    = (1 << 2),

Modified: trunk/pingus/src/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus_main.cpp    2008-07-01 03:40:29 UTC (rev 3611)
+++ trunk/pingus/src/pingus_main.cpp    2008-07-01 03:44:55 UTC (rev 3612)
@@ -234,12 +234,6 @@
   if (options.debug.is_set())
     pingus_debug_flags = options.debug.get();
 
-  if (options.min_frame_skip.is_set())
-    min_frame_skip = options.min_frame_skip.get();
-
-  if (options.max_frame_skip.is_set())
-    max_frame_skip = options.max_frame_skip.get();
-
   if (options.speed.is_set())
     game_speed = options.speed.get();
 
@@ -325,12 +319,6 @@
                   _("Enable the output of debugging info, possible "
                     "OPTIONs are tiles, gametime, actions, sound, resources, 
gui, "
                     "input, pathmgr"));
-  argp.add_option(354, "min-frame-skip", "N",
-                  _("Skip at least N frames, larger values speed the game 
up"));
-  argp.add_option(355, "max-frame-skip", "N",
-                  _("Skip at most N frames"));
-  argp.add_option(357, "frame-skip",  "N",
-                  _("Set both min and max frameskip to N"));
   argp.add_option('t', "speed", "SPEED",
                   _("Set the game speed (0=fastest, >0=slower)"));
   argp.add_option('k', "fps", "FPS",
@@ -527,19 +515,6 @@
             pingus_debug_flags = cmd_options.debug.get();
             break;
 
-          case 354:
-            
cmd_options.min_frame_skip.set(StringUtil::to<int>(argp.get_argument()));
-            break;
-
-          case 355: // max_frame_skip
-            
cmd_options.max_frame_skip.set(StringUtil::to<int>(argp.get_argument()));
-            break;
-
-          case 357: // frame_skip
-            
cmd_options.max_frame_skip.set(StringUtil::to<int>(argp.get_argument()));
-            
cmd_options.min_frame_skip.set(StringUtil::to<int>(argp.get_argument()));
-            break;
-
           case 360:
             cmd_options.controller.set(argp.get_argument());
             break;

Modified: trunk/pingus/src/pingus_options.hpp
===================================================================
--- trunk/pingus/src/pingus_options.hpp 2008-07-01 03:40:29 UTC (rev 3611)
+++ trunk/pingus/src/pingus_options.hpp 2008-07-01 03:44:55 UTC (rev 3612)
@@ -90,8 +90,6 @@
   Value<bool> maintainer_mode;
   Value<unsigned int> debug;
 
-  Value<int>  min_frame_skip;
-  Value<int>  max_frame_skip;
   Value<int>  speed;
   Value<float> desiredfps;
   Value<int>  tile_size;