[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3736 - in trunk/pingus/src: . worldobjs
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3736 - in trunk/pingus/src: . worldobjs |
Date: |
Tue, 8 Jul 2008 08:10:30 +0200 |
Author: grumbel
Date: 2008-07-08 08:10:28 +0200 (Tue, 08 Jul 2008)
New Revision: 3736
Modified:
trunk/pingus/src/globals.cpp
trunk/pingus/src/globals.hpp
trunk/pingus/src/pingus_main.cpp
trunk/pingus/src/worldobjs/surface_background.cpp
Log:
Removed some unused variables and options
Modified: trunk/pingus/src/globals.cpp
===================================================================
--- trunk/pingus/src/globals.cpp 2008-07-08 05:58:53 UTC (rev 3735)
+++ trunk/pingus/src/globals.cpp 2008-07-08 06:10:28 UTC (rev 3736)
@@ -23,8 +23,6 @@
int verbose = 0;
bool music_enabled = true;
bool sound_enabled = true;
-bool enable_demo_recording = false;
-bool play_demo = false;
int fast_forward_time_scale = 4;
bool maintainer_mode = false;
std::string demo_file;
@@ -38,9 +36,6 @@
int screen_height = default_screen_height;
bool draw_collision_map = false;
bool swcursor_enabled = false;
-bool action_help = true;
-bool show_input_debug_screen = false;
-bool render_preview = false;
std::string controller_file;
@@ -52,12 +47,4 @@
bool fullscreen_enabled = false;
-#if defined(WIN32) || defined(__APPLE__)
-// The clanSDL target is a little buggy on Windows and OSX - Use OpenGL by
default
-bool use_opengl = true;
-#else
-// Use the clanSDL target by default for systems other than Windows and OSX
(aka Linux).
-bool use_opengl = false;
-#endif
-
/* EOF */
Modified: trunk/pingus/src/globals.hpp
===================================================================
--- trunk/pingus/src/globals.hpp 2008-07-08 05:58:53 UTC (rev 3735)
+++ trunk/pingus/src/globals.hpp 2008-07-08 06:10:28 UTC (rev 3736)
@@ -22,8 +22,7 @@
#include "pingus.hpp"
#include <string>
-
-
+
extern int game_speed; ///< -t, --set-speed
extern float desired_fps; ///< -k, --set-fps
extern bool print_fps; ///< --print-fps
@@ -32,9 +31,6 @@
extern bool music_enabled; ///< -m, --enable-music
extern bool sound_enabled; ///< -s, --enable-sound
-extern bool enable_demo_recording;
-extern bool play_demo; ///< --play-demo
-
extern bool debug_actions; ///< --debug-actions
extern int fast_forward_time_scale; ///< how much faster the
game runs in FF mode
extern bool maintainer_mode; ///< --maintainer-mode
@@ -52,16 +48,11 @@
extern std::string controller_file; ///< --controller
-extern bool use_opengl; ///< --use-opengl
-extern bool action_help; ///< --action-help
-extern bool show_input_debug_screen; ///<
-extern bool render_preview; ///<
-
-extern std::string global_username; ///< The name of the
currently logged in user
-extern std::string global_email; ///< The email address of
the currently logged in user
-extern std::string default_language; ///< The default language,
which is used when the env var LANG is not set
+extern std::string global_username; ///< The name of the
currently logged in user
+extern std::string global_email; ///< The email address of
the currently logged in user
+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
-
+
enum { PINGUS_DEBUG_ACTIONS = (1 << 0),
PINGUS_DEBUG_SOUND = (1 << 1),
PINGUS_DEBUG_GAMETIME = (1 << 2),
@@ -78,8 +69,7 @@
PINGUS_DEBUG_DIRECTORIES = (1 << 13),
PINGUS_DEBUG_ALL = (~0)
};
-
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus_main.cpp 2008-07-08 05:58:53 UTC (rev 3735)
+++ trunk/pingus/src/pingus_main.cpp 2008-07-08 06:10:28 UTC (rev 3736)
@@ -286,9 +286,7 @@
argp.add_group(_("Debugging and experimental stuff:"));
argp.add_option(334, "maintainer-mode", "",
_("Enables some features, only interesting to programmers"));
- if (0)
- argp.add_option(358, "worldmap", "",
- _("Load a custom worldmap"));
+
argp.add_option('D', "debug", "OPTION",
_("Enable the output of debugging info, possible "
"OPTIONs are tiles, gametime, actions, sound, resources,
gui, "
@@ -366,16 +364,6 @@
"For more information about these matters, see the files named
COPYING." << std::endl;
exit(EXIT_SUCCESS);
break;
-
- case 'r': // -r, --enabled-demo-recording
- enable_demo_recording = false;
- break;
- case 'p': // -p, --play-demo
- play_demo = true;
- demo_file = argp.get_argument();
- if (verbose)
- std::cout << "Using demofile: " << demo_file << std::endl;
- break;
case 'f': // --fullscreen
cmd_options.fullscreen.set(true);
@@ -508,10 +496,6 @@
break;
}
}
-
- // make sure that we're not recording a demo while already playing one
- if (play_demo)
- enable_demo_recording = false;
}
// Get all filenames and directories
Modified: trunk/pingus/src/worldobjs/surface_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/surface_background.cpp 2008-07-08 05:58:53 UTC
(rev 3735)
+++ trunk/pingus/src/worldobjs/surface_background.cpp 2008-07-08 06:10:28 UTC
(rev 3736)
@@ -129,38 +129,27 @@
if (!bg_surface)
return;
- if (render_preview)
- {
-#if 0 // FIXME:
- for(int y = 0; y < gc.get_height(); y += bg_surface.get_height())
- for(int x = 0; x < gc.get_width(); x += bg_surface.get_width())
- gc.color().draw(bg_surface, Vector3f(x, y));
-#endif
- }
- else
- {
- Vector3f offset = gc.color().world_to_screen(Vector3f(0,0));
+ Vector3f offset = gc.color().world_to_screen(Vector3f(0,0));
- int start_x = static_cast<int>((offset.x * para_x) + scroll_ox);
- int start_y = static_cast<int>((offset.y * para_y) + scroll_oy);
+ int start_x = static_cast<int>((offset.x * para_x) + scroll_ox);
+ int start_y = static_cast<int>((offset.y * para_y) + scroll_oy);
- if (start_x > 0)
- start_x = (start_x % bg_surface.get_width()) - bg_surface.get_width();
+ if (start_x > 0)
+ start_x = (start_x % bg_surface.get_width()) - bg_surface.get_width();
- if (start_y > 0)
- start_y = (start_y % bg_surface.get_height()) -
bg_surface.get_height();
+ if (start_y > 0)
+ start_y = (start_y % bg_surface.get_height()) - bg_surface.get_height();
- for(int y = start_y;
- y < world->get_height();
- y += bg_surface.get_height())
+ for(int y = start_y;
+ y < world->get_height();
+ y += bg_surface.get_height())
+ {
+ for(int x = start_x;
+ x < world->get_width();
+ x += bg_surface.get_width())
{
- for(int x = start_x;
- x < world->get_width();
- x += bg_surface.get_width())
- {
- gc.color().draw(bg_surface, Vector3f(x - offset.x,
- y - offset.y, pos.z));
- }
+ gc.color().draw(bg_surface, Vector3f(x - offset.x,
+ y - offset.y, pos.z));
}
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3736 - in trunk/pingus/src: . worldobjs,
grumbel at BerliOS <=