[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.144,1.145 config.cxx,1.12,1.13 globals.cxx,1.9,1.10 globals.hxx,1.12,1.13 option_menu.cxx,1.13,1.14 pingus_main.cxx,1.70,1.71 pingus_menu_manager.cxx,1.23,1.24 pingus_menu_manager.hxx,1.18,1.19 playfield.cxx,1.31,1.32 intro.cxx,1.7,NONE intro.hxx,1.6,NONE

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv2681

Modified Files:
        Makefile.am config.cxx globals.cxx globals.hxx option_menu.cxx 
        pingus_main.cxx pingus_menu_manager.cxx 
        pingus_menu_manager.hxx playfield.cxx 
Removed Files:
        intro.cxx intro.hxx 
Log Message:
removed some unused stuff

Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/Makefile.am,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- Makefile.am 5 Apr 2003 23:24:32 -0000       1.144
+++ Makefile.am 10 Apr 2003 18:28:30 -0000      1.145
@@ -156,8 +156,6 @@
 input_event.hxx \
 indexed_canvas.hxx \
 indexed_canvas.cxx \
-intro.cxx \
-intro.hxx \
 layer_manager.cxx \
 layer_manager.hxx \
 level_desc.cxx \

Index: config.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/config.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- config.cxx  8 Apr 2003 19:56:40 -0000       1.12
+++ config.cxx  10 Apr 2003 18:28:30 -0000      1.13
@@ -314,10 +314,6 @@
     {
       print_fps = str_to_bool(value);
     }
-  else if (valueid == "show-intro")
-    {
-      intro_disabled = !str_to_bool(value);
-    }
   else if (valueid == "fast-mode")
     {
       fast_mode = str_to_bool(value);
@@ -330,10 +326,6 @@
     {
       Cheat::unlimited_actions = str_to_bool(value);
     }
-  else if (valueid == "quick-play")
-    {
-      quick_play = str_to_bool(value);
-    }
   else if (valueid == "cursor-enabled")
     {
       cursor_enabled = str_to_bool(value);
@@ -353,10 +345,6 @@
   else if (valueid == "height")
     {
       screen_height = str_to_int(value);
-    }
-  else if (valueid == "preload-data")
-    {
-      preload_data = str_to_bool(value);
     }
   else if (valueid == "sound")
     {

Index: globals.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/globals.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- globals.cxx 10 Apr 2003 11:51:32 -0000      1.9
+++ globals.cxx 10 Apr 2003 18:28:30 -0000      1.10
@@ -24,15 +24,10 @@
 int         verbose                         = 0;
 bool        music_enabled                   = true;
 bool        sound_enabled                   = true;
-bool        gimmicks_enabled                = false;
-bool        intro_disabled                  = false;
 bool        record_demo                     = false;
 bool        play_demo                       = false;
 bool        cursor_enabled                  = false;
-bool        fs_preload                      = false;  
 bool        fast_mode                       = false;
-bool        previews_enabled                = true;
-bool        quick_play                      = false;
 bool        maintainer_mode                 = false;
 std::string demo_file;
 bool        start_editor                    = false;
@@ -45,11 +40,9 @@
 #endif
 int         screen_width                    = 800;
 int         screen_height                   = 600;
-bool        preload_data                    = false; // FIXME: Should be 
default if it would work
 bool        draw_collision_map              = false;
 bool        swcursor_enabled                = false;
 std::string config_file;
-bool        background_manipulation_enabled = true;
 bool        max_cpu_usage                   = true;
 bool        use_opengl                      = false;
 bool        action_help                     = true;

Index: globals.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/globals.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- globals.hxx 18 Feb 2003 21:38:08 -0000      1.12
+++ globals.hxx 10 Apr 2003 18:28:30 -0000      1.13
@@ -31,16 +31,11 @@
 extern int         verbose;                         ///< -v, --verbose
 extern bool        music_enabled;                   ///< -m, --enable-music
 extern bool        sound_enabled;                   ///< -s, --enable-sound
-extern bool        gimmicks_enabled;                ///< -i, --enable-gimmicks
-extern bool        intro_disabled;                  ///< -n, --disable-intro
 extern bool        record_demo;                     ///< --record-demo
 extern bool        play_demo;                       ///< --play-demo
 extern bool        cursor_enabled;                  ///< --enable-cursor
 extern bool        debug_actions;                   ///< --debug-actions
-extern bool        fs_preload;                      ///< --fs-preload
 extern bool        fast_mode;                       ///< --fast
-extern bool        previews_enabled;                ///< --disable-previews
-extern bool        quick_play;                      ///< -q, --quick_play
 extern bool        maintainer_mode;                 ///< --maintainer-mode
 extern bool        start_editor;                    ///<
 extern std::string demo_file;                       ///<
@@ -49,13 +44,9 @@
 extern bool        fullscreen_enabled;              ///< --enable-fullscreen
 extern int         screen_width;                    ///<
 extern int         screen_height;                   ///<
-extern bool        preload_data;                    ///<
 extern bool        draw_collision_map;              ///<
-extern bool        debug_tiles;                     ///<
 extern bool        swcursor_enabled;                ///< --enable-swcursor
 extern std::string config_file;                     ///< --config-file
-extern bool        background_manipulation_enabled; ///< 
--enable-bg-manipulation
-extern bool        debug_game_time;                 ///< --debug-game-time
 extern bool        max_cpu_usage;                   ///< --max-cpu-usage
 extern bool        use_opengl;                      ///< --use-opengl
 extern bool        action_help;                     ///< --action-help

Index: option_menu.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/option_menu.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- option_menu.cxx     19 Feb 2003 09:50:36 -0000      1.13
+++ option_menu.cxx     10 Apr 2003 18:28:30 -0000      1.14
@@ -272,7 +272,6 @@
   is_init = true;
 
   // Bool options
-  add_entry(_("Gimmicks"),  &gimmicks_enabled);
   add_entry(_("Unlimited Actions"),  &Cheat::unlimited_actions);
   add_entry(_("Print fps"), &print_fps);
   //  add_entry("Debug actions", &debug_actions);  
@@ -283,10 +282,7 @@
   add_entry(_("Verbose"), &verbose);
   add_entry(_("Music"), &music_enabled);
   add_entry(_("Sound"), &sound_enabled);
-  add_entry(_("Level Previews"), &previews_enabled);
   add_entry(_("Draw ColMap"), &draw_collision_map);
-  //add_entry(_("Debug GameTime"), &debug_game_time);
-  //add_entry(_("Debug Tiles"), &debug_tiles);
   add_entry(_("Auto Scrolling"), &auto_scrolling);
   add_entry(_("Action Help Strings"), &action_help);
 }

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- pingus_main.cxx     10 Apr 2003 14:36:35 -0000      1.70
+++ pingus_main.cxx     10 Apr 2003 18:28:30 -0000      1.71
@@ -239,9 +239,8 @@
       {"use-opengl",        no_argument,       0, 'G'},
 #endif
       // FIXME: is the number stuff correct?
-      {"fs-preload",      no_argument,       0, 130},
       {"fast",            no_argument,       0, 132},
-      {"fast-mode",            no_argument,       0, 132},
+      {"fast-mode",       no_argument,       0, 132},
       {"disable-previews",no_argument,       0, 133}, 
       {"maintainer-mode", no_argument,       0, 134},
       {"disable-auto-scrolling",   no_argument,       0, 137},
@@ -286,7 +285,6 @@
          levelfile = std::string(cwd) + "/" + levelfile;
        if (verbose) 
          std::cout << "PingusMain:check_args: Levelfile = " << levelfile << 
std::endl;
-       intro_disabled = true;
       }
       break;
     case 't': // -t, --set-speed
@@ -294,12 +292,8 @@
       break;
     case 'e':
       start_editor = true;
-      intro_disabled = true;
       //std::cout << "PingusMain: Starting Editor" << std::endl;
       break;
-    case 'q':
-      quick_play = true;
-      break;
 
 #ifdef HAVE_LIBCLANGL
     case 'G':
@@ -345,9 +339,6 @@
          std::cout << "PingusMain: -d: optarg is (null)" << std::endl;
        }
       break;
-    case 'n':
-      intro_disabled = true;
-      break;
     case 'V':
       std::cout << "Pingus Version " << VERSION 
 #ifndef OFFICIAL_PINGUS_BUILD
@@ -363,10 +354,6 @@
 
       exit(EXIT_SUCCESS);
       break;
-    case 'i':
-      gimmicks_enabled = true;
-      if (verbose) std::cout << "Pingus: Gimmicks enabled" << std::endl;
-      break; 
     case 'r': // -r, --record-demo
       record_demo = true;
       demo_file = optarg;
@@ -391,16 +378,9 @@
       break;
 
       // Starting weird number options... no idea if this is correct.
-    case 130: // --fs-preload
-      fs_preload = true;
-      previews_enabled = true;
-      break;
     case 132:
       fast_mode = true;
       break;
-    case 133:
-      previews_enabled = false;
-      break;
     case 134: // --maintainer_mode
       std::cout << "---------------------------------" << std::endl
                << "--- Maintainer Mode activated ---" << std::endl
@@ -431,10 +411,6 @@
       config_file = optarg;
       break;
       
-    case 148:
-      background_manipulation_enabled = true;
-      break;
-
     case 152:
       if (strcmp (optarg, "all") == 0)
        {
@@ -529,8 +505,8 @@
        _("   -w, --window             Start in Window Mode\n"
           "   -f, --fullscreen         Start in Fullscreen\n"
           "   -d, --datadir PATH       Set the path to load the data files to 
`path'\n"
-          "   --use-datafile           Use the pre-compiled datafile 
(default)\n"
-          "   --use-scriptfile         Use the scriptfile and read all data 
from files\n"
+          //"   --use-datafile           Use the pre-compiled datafile 
(default)\n"
+          //          "   --use-scriptfile         Use the scriptfile and read 
all data from files\n"
           "   -l, --level FILE         Load a custom level from `file'\n"
           "   -v, --verbose            Print some more messages to stdout, can 
be set\n"
           "                            multible times to increase verbosity\n"
@@ -552,14 +528,11 @@
 
           "\nDebugging and experimental stuff:\n"
           "   --maintainer-mode        Enables some features, only interesting 
programmers\n"
-          "   --enable-bg-manipulation Enables color manipulation of level 
backgrounds\n"
           "   --debug OPTION           Enable the output of debugging infos, 
possible\n"
           "                            OPTION's are tiles, gametime, actions, 
sound, resources, gui,\n"
           "                            input\n"
           "   -t, --speed SPEED        Set the game speed (0=fastest, 
>0=slower)\n"
           "   -b, --print-fps          Prints the fps to stdout\n"
-          "   -i, --enable-gimmicks    Enable some buggy development stuff\n"
-          "   -S, --sound-specs FILE   Use files mentioned in FILE\n"
           "   --tile-size INT          Set the size of the map tiles (default: 
32)\n"
           "\n"
           "\nDemo playing and recording:\n"
@@ -581,7 +554,6 @@
     {
       if (levelfile.empty()) {
        levelfile = argv[i];
-       intro_disabled = true;
 
        if (!System::exist(levelfile))
          {

Index: pingus_menu_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- pingus_menu_manager.cxx     27 Mar 2003 15:57:22 -0000      1.23
+++ pingus_menu_manager.cxx     10 Apr 2003 18:28:30 -0000      1.24
@@ -26,15 +26,10 @@
 PingusMenuManager* PingusMenuManager::instance_ = 0;
 
 PingusMenuManager::PingusMenuManager ()
-  : intro (this), mainmenu (this), optionmenu (this),
+  : mainmenu (this), optionmenu (this),
     exitmenu (this)
 {
-  //current_menu = 0;
-  //if (intro_disabled)
   push_menu (&mainmenu);
-  
-  //else
-  //push_menu (&intro); 
 }
 
 PingusMenuManager::~PingusMenuManager ()

Index: pingus_menu_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_menu_manager.hxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- pingus_menu_manager.hxx     27 Mar 2003 15:57:22 -0000      1.18
+++ pingus_menu_manager.hxx     10 Apr 2003 18:28:30 -0000      1.19
@@ -23,7 +23,6 @@
 #include "menu_background.hxx"
 #include "exit_menu.hxx"
 #include "pingus_menu.hxx"
-#include "intro.hxx"
 #include "option_menu.hxx"
 #include "sprite.hxx"
 
@@ -46,7 +45,6 @@
 public:
   /* Menu's FIXME: These shouldn't get exported to the outsite,
      instead only handles (enum's) should be visible */
-  Intro intro;
   PingusMenu mainmenu;
   OptionMenu optionmenu;
   MenuBackground background;

Index: playfield.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- playfield.cxx       19 Feb 2003 10:37:31 -0000      1.31
+++ playfield.cxx       10 Apr 2003 18:28:30 -0000      1.32
@@ -64,23 +64,12 @@
        generate_clipping_rects(x1, y1, x2, y2);
       }
 
-    if (gimmicks_enabled) 
-      {
-       if (verbose)
-         std::cout << "Playfield: Using gimmick" << std::endl;
-       view.push_back(new View(client, 0, 21, x2/2, y2/2, 0.5f));
-       view.push_back(new View(client, x2/2, y1, x2, y2, 1.0f));
-       view.push_back(new View(client, 0, y2/2, x2/2, y2, 2.0f));
-      } 
-    else
-      { // !gimmicks_enabled
-       view.push_back(new View(client, x1, y1, x2, y2));
+    view.push_back(new View(client, x1, y1, x2, y2));
        
-       view[0]->set_x_offset(((x2 - x1) / 2) - world->get_start_x());
-       view[0]->set_y_offset(((y2 - y1) / 2) - world->get_start_y());
+    view[0]->set_x_offset(((x2 - x1) / 2) - world->get_start_x());
+    view[0]->set_y_offset(((y2 - y1) / 2) - world->get_start_y());
        
-       world->set_view (view[0]);
-      }
+    world->set_view (view[0]);
   }
 }
 

--- intro.cxx DELETED ---

--- intro.hxx DELETED ---