[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src globals.cxx,1.10,1.11 globals.hxx,1.
|
From: |
grumbel |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src globals.cxx,1.10,1.11 globals.hxx,1.13,1.14 pingus_main.cxx,1.71,1.72 server.cxx,1.26,1.27start_screen.cxx,1.13,1.14 |
|
Date: |
10 Apr 2003 19:38:53 -0000 |
Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv6552
Modified Files:
globals.cxx globals.hxx pingus_main.cxx server.cxx
start_screen.cxx
Log Message:
- cleaned up options a bit more
- wrote a man-page
- incremented version to 0.6.0rc2
Index: globals.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/globals.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- globals.cxx 10 Apr 2003 18:28:30 -0000 1.10
+++ globals.cxx 10 Apr 2003 19:38:51 -0000 1.11
@@ -24,7 +24,7 @@
int verbose = 0;
bool music_enabled = true;
bool sound_enabled = true;
-bool record_demo = false;
+bool enable_demo_recording = false;
bool play_demo = false;
bool cursor_enabled = false;
bool fast_mode = false;
Index: globals.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/globals.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- globals.hxx 10 Apr 2003 18:28:30 -0000 1.13
+++ globals.hxx 10 Apr 2003 19:38:51 -0000 1.14
@@ -29,10 +29,13 @@
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 record_demo; ///< --record-demo
+
+extern bool enable_demo_recording;
extern bool play_demo; ///< --play-demo
+
extern bool cursor_enabled; ///< --enable-cursor
extern bool debug_actions; ///< --debug-actions
extern bool fast_mode; ///< --fast
Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- pingus_main.cxx 10 Apr 2003 18:28:30 -0000 1.71
+++ pingus_main.cxx 10 Apr 2003 19:38:51 -0000 1.72
@@ -209,7 +209,7 @@
{"enable-cursor", no_argument, 0, 'c'},
{"disable-intro", no_argument, 0, 'n'},
{"play-demo", required_argument, 0, 'p'},
- {"record-demo", required_argument, 0, 'r'},
+ {"enable-demo-recording", required_argument, 0, 'r'},
{"speed", required_argument, 0, 't'},
{"datadir", required_argument, 0, 'd'},
{"level", required_argument, 0, 'l'},
@@ -354,9 +354,8 @@
exit(EXIT_SUCCESS);
break;
- case 'r': // -r, --record-demo
- record_demo = true;
- demo_file = optarg;
+ case 'r': // -r, --enabled-demo-recording
+ enable_demo_recording = true;
break;
case 'p': // -p, --play-demo
play_demo = true;
@@ -494,12 +493,9 @@
" -g, --geometry {width}x{height}\n"
" Set the resolution for pingus (default:
800x600)\n"
" -h, --help Displays this screen\n"
- " --disable-intro Disable intro\n")
- << std::endl;
+ " --disable-intro Disable intro\n");
#ifdef HAVE_LIBCLANGL
- std::cout <<
- _(" -G, --use-opengl Use OpenGL\n")
- << std::endl;
+ std::cout << _(" -G, --use-opengl Use OpenGL\n");
#endif
std::cout <<
_(" -w, --window Start in Window Mode\n"
@@ -507,37 +503,38 @@
" -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"
- " -l, --level FILE Load a custom level from `file'\n"
+ " -l, --level FILE Load a custom level from FILE\n"
+ " -w, --worldmap FILE Load a custom worldmap from FILE\n"
" -v, --verbose Print some more messages to stdout, can
be set\n"
" multible times to increase verbosity\n"
" -V, --version Prints version number and exit\n"
- " --fast-mode Disable some cpu intensive features\n"
" -e, --editor Launch the Level editor
(experimental)\n"
" --disable-auto-scrolling Disable automatic scrolling\n"
- " --disable-swcursor Disable software cursor, use hw cursor
instead\n"
- " --enable-swcursor Enable software cursor\n"
- " --disable-action-help Disable action button help strings\n"
- " --enable-action-help Enable action button help
strings(default)\n"
+ // " --disable-swcursor Disable software cursor,
use hw cursor instead\n"
+ // " --enable-swcursor Enable software cursor\n"
+ //" --disable-action-help Disable action button help strings\n"
+ //" --enable-action-help Enable action button help
strings(default)\n"
" --no-cfg-file Don't read ~/.pingus/config\n"
" --config-file FILE Read config from FILE (default:
~/.pingus/config)\n"
- " --min-cpu-usage Reduces the CPU usage by issuing
sleep()\n"
" reduce CPU usage, might speed up the
game on slower machines\n"
- " --min-frame-skip N Skip at least N frames, larger values
speed the game up\n"
- " --max-frame-skip N Skip at most N frames\n"
- " --frame-skip N Set both min and max frameskip to N\n"
-
"\nDebugging and experimental stuff:\n"
" --maintainer-mode Enables some features, only interesting
programmers\n"
" --debug OPTION Enable the output of debugging infos,
possible\n"
" OPTION's are tiles, gametime, actions,
sound, resources, gui,\n"
" input\n"
+ " --min-frame-skip N Skip at least N frames, larger values
speed the game up\n"
+ " --max-frame-skip N Skip at most N frames\n"
+ " --frame-skip N Set both min and max frameskip to N\n"
" -t, --speed SPEED Set the game speed (0=fastest,
>0=slower)\n"
" -b, --print-fps Prints the fps to stdout\n"
" --tile-size INT Set the size of the map tiles (default:
32)\n"
+ " --fast-mode Disable some cpu intensive features\n"
+ " --min-cpu-usage Reduces the CPU usage by issuing
sleep()\n"
"\n"
"\nDemo playing and recording:\n"
- " -r, --record-demo FILE Record a demo session to FILE\n"
- " -p, --play-demo FILE Plays a demo session from FILE\n")
+ " -p, --play-demo FILE Plays a demo session from FILE\n"
+ " -r, --enable-demo-recording\n"
+ " Record demos for each played level\n")
<< std::endl;
std::cout
<< _("\nSound:\n"
Index: server.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/server.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- server.cxx 5 Apr 2003 18:36:50 -0000 1.26
+++ server.cxx 10 Apr 2003 19:38:51 -0000 1.27
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "pingu.hxx"
+#include "globals.hxx"
#include "server.hxx"
#include "game_time.hxx"
#include "world.hxx"
@@ -31,8 +32,10 @@
world(new World (plf)),
action_holder (plf),
goal_manager(new GoalManager(this)),
- demo_recorder(new DemoRecorder(this))
+ demo_recorder(0)
{
+ if (enable_demo_recording)
+ demo_recorder = new DemoRecorder(this);
}
Server::~Server ()
Index: start_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/start_screen.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- start_screen.cxx 10 Apr 2003 16:59:57 -0000 1.13
+++ start_screen.cxx 10 Apr 2003 19:38:51 -0000 1.14
@@ -147,9 +147,9 @@
System::translate(plf->get_levelname()));
gc.print_left(Fonts::chalk_normal,
- CL_Display::get_width()/2 - 270,
+ CL_Display::get_width()/2 - 290,
CL_Display::get_height()/2 - 140,
- format_description(800 - 260));
+ format_description(800 - 230));
gc.print_left (Fonts::chalk_normal, left_x, y, _("Number of Pingus: "));
gc.print_right(Fonts::chalk_normal, right_x, y,
to_string(plf->get_pingus()));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src globals.cxx,1.10,1.11 globals.hxx,1.13,1.14 pingus_main.cxx,1.71,1.72 server.cxx,1.26,1.27start_screen.cxx,1.13,1.14,
grumbel <=
- Prev by Date:
[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
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/m4 - New directory
- Previous by thread:
[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
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/m4 - New directory
- Index(es):