[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src globals.cc,1.40,1.41 globals.hh,1.37,
|
From: |
torangan |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src globals.cc,1.40,1.41 globals.hh,1.37,1.38 |
|
Date: |
6 Jun 2002 15:24:07 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv25408
Modified Files:
globals.cc globals.hh
Log Message:
changed debug #defines to enum, formatting, corrected wrong use of doxygen
commands
Index: globals.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/globals.cc,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- globals.cc 6 Jun 2002 14:05:44 -0000 1.40
+++ globals.cc 6 Jun 2002 15:24:05 -0000 1.41
@@ -19,44 +19,44 @@
#include "globals.hh"
-int game_speed = 25;
-bool print_fps = false;
-int verbose = 0;
-bool music_enabled = false;
-bool sound_enabled = false;
-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 unlimited_actions = false;
-bool quick_play = false;
-bool maintainer_mode = false;
+int game_speed = 25;
+bool print_fps = false;
+int verbose = 0;
+bool music_enabled = false;
+bool sound_enabled = false;
+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 unlimited_actions = false;
+bool quick_play = false;
+bool maintainer_mode = false;
std::string demo_file;
-bool start_editor = false;
-bool auto_scrolling = true;
-int tile_size = 32;
-bool fullscreen_enabled = false;
-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; // --enable-swcursor
-std::string config_file; // --config-file
-bool background_manipulation_enabled = true; // --enable-bg-manipulation
-bool use_datafile = false; // --use-datafile
-bool max_cpu_usage = false; /// --max-cpu-usage
-float frame_skip = 1.0f; /// --frame-skip
-bool use_opengl = false;
-bool action_help = true;
+bool start_editor = false;
+bool auto_scrolling = true;
+int tile_size = 32;
+bool fullscreen_enabled = false;
+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 use_datafile = false;
+bool max_cpu_usage = false;
+float frame_skip = 1.0f;
+bool use_opengl = false;
+bool action_help = true;
std::string global_username;
std::string global_email;
-std::string default_language = "en";
+std::string default_language = "en";
-int pingus_debug_flags = 0;
+int pingus_debug_flags = 0;
/* EOF */
Index: globals.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/globals.hh,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- globals.hh 15 Jan 2002 10:48:49 -0000 1.37
+++ globals.hh 6 Jun 2002 15:24:05 -0000 1.38
@@ -17,6 +17,10 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+/** This file defines some global variables, most of them are used to
+ keep the values of command line arguments. */
+
+
#ifndef GLOBALS_HH
#define GLOBALS_HH
@@ -27,67 +31,61 @@
#include <string>
-/** This file defines some global variables, most of them are used to
- keep the values of command line arguments. */
-extern int game_speed; /// -t, --set-speed
-extern bool print_fps; /// --print-fps
-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 unlimited_actions; /// --enable-uactions
-extern bool quick_play; /// -q, --quick_play
-extern bool maintainer_mode; /// --maintainer-mode
-extern bool start_editor; ///
-extern std::string demo_file; ///
-extern bool auto_scrolling; /// --enable-auto-scrolling
-extern int tile_size; /// --tile-size
-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_datafile; /// --use-datafile
-extern float frame_skip; /// --frame-skip
-extern bool use_opengl; /// --use-opengl
-extern bool action_help; /// --action-help
+extern int game_speed; ///< -t, --set-speed
+extern bool print_fps; ///< --print-fps
+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 unlimited_actions; ///< --enable-uactions
+extern bool quick_play; ///< -q, --quick_play
+extern bool maintainer_mode; ///< --maintainer-mode
+extern bool start_editor; ///<
+extern std::string demo_file; ///<
+extern bool auto_scrolling; ///<
--enable-auto-scrolling
+extern int tile_size; ///< --tile-size
+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_datafile; ///< --use-datafile
+extern float frame_skip; ///< --frame-skip
+extern bool use_opengl; ///< --use-opengl
+extern bool action_help; ///< --action-help
-/// The name of the currently logged in user
-extern std::string global_username;
-/// The email address of the currently logged in user
-extern std::string global_email;
+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 int pingus_debug_flags; ///< Set some bits in this
thing to get debug infos
-/** The default language, which is used when the env var LANG is not
- set */
-extern std::string default_language;
-/** Set some bits in this thing to get debug infos */
-extern int pingus_debug_flags;
+enum { PINGUS_DEBUG_ACTIONS = (1 << 0),
+ PINGUS_DEBUG_SOUND = (1 << 1),
+ PINGUS_DEBUG_GAMETIME = (1 << 2),
+ PINGUS_DEBUG_TILES = (1 << 3),
+ PINGUS_DEBUG_LOADING = (1 << 4),
+ PINGUS_DEBUG_EDITOR = (1 << 5),
+ PINGUS_DEBUG_BLITTER = (1 << 6),
+ PINGUS_DEBUG_TRANSLATOR = (1 << 7),
+ PINGUS_DEBUG_ALL = (~0)
+ };
-#define PINGUS_DEBUG_ACTIONS (1 << 0)
-#define PINGUS_DEBUG_SOUND (1 << 1)
-#define PINGUS_DEBUG_GAMETIME (1 << 2)
-#define PINGUS_DEBUG_TILES (1 << 3)
-#define PINGUS_DEBUG_LOADING (1 << 4)
-#define PINGUS_DEBUG_EDITOR (1 << 5)
-#define PINGUS_DEBUG_BLITTER (1 << 6)
-#define PINGUS_DEBUG_TRANSLATOR (1 << 7)
-#define PINGUS_DEBUG_ALL (~0)
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src globals.cc,1.40,1.41 globals.hh,1.37,1.38,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap PingusWorldMap.cc,1.37,1.38 PingusWorldMap.hh,1.21,1.22 PingusWorldMapGraph.cc,1.31,1.32 PingusWorldMapGraph.hh,1.20,1.21 PingusWorldMapManager.cc,1.21,1.22 PingusWorldMapManager.hh,1.8,1.9 PingusWorldMapNode.cc,1.2,1.3 PingusWorldMapStat.cc,1.5,1.6
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src Controller.hh,1.10,1.11
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap PingusWorldMap.cc,1.37,1.38 PingusWorldMap.hh,1.21,1.22 PingusWorldMapGraph.cc,1.31,1.32 PingusWorldMapGraph.hh,1.20,1.21 PingusWorldMapManager.cc,1.21,1.22 PingusWorldMapManager.hh,1.8,1.9 PingusWorldMapNode.cc,1.2,1.3 PingusWorldMapStat.cc,1.5,1.6
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src Controller.hh,1.10,1.11
- Index(es):