projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20000917-1-src
[rocksndiamonds.git]
/
src
/
misc.c
diff --git
a/src/misc.c
b/src/misc.c
index 8b86b89c3476d77a01244b9cf956bf1ce82309b4..aaad307ae05c1bdb65404f9f02062962bcae3d48 100644
(file)
--- a/
src/misc.c
+++ b/
src/misc.c
@@
-464,6
+464,12
@@
void GetOptions(char *argv[])
options.serveronly = FALSE;
options.network = FALSE;
options.verbose = FALSE;
options.serveronly = FALSE;
options.network = FALSE;
options.verbose = FALSE;
+ options.debug = FALSE;
+
+ /* initialize some more global variables */
+ global.frames_per_second = 0;
+ global.fps_slowdown = FALSE;
+ global.fps_slowdown_factor = 1;
while (*options_left)
{
while (*options_left)
{
@@
-505,7
+511,7
@@
void GetOptions(char *argv[])
"Options:\n"
" -d, --display machine:0 X server display\n"
" -b, --basepath directory alternative base directory\n"
"Options:\n"
" -d, --display machine:0 X server display\n"
" -b, --basepath directory alternative base directory\n"
- " -l, --level directory alternative level directory\n"
+ " -l, --level directory
alternative level directory\n"
" -s, --serveronly only start network server\n"
" -n, --network network multiplayer game\n"
" -v, --verbose verbose mode\n",
" -s, --serveronly only start network server\n"
" -n, --network network multiplayer game\n"
" -v, --verbose verbose mode\n",
@@
-557,6
+563,10
@@
void GetOptions(char *argv[])
{
options.verbose = TRUE;
}
{
options.verbose = TRUE;
}
+ else if (strncmp(option, "-debug", option_len) == 0)
+ {
+ options.debug = TRUE;
+ }
else if (*option == '-')
{
Error(ERR_EXIT_HELP, "unrecognized option '%s'", option_str);
else if (*option == '-')
{
Error(ERR_EXIT_HELP, "unrecognized option '%s'", option_str);
@@
-1172,8
+1182,13
@@
boolean validLevelSeries(struct LevelDirInfo *node)
struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *node)
{
struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *node)
{
- if (node == NULL) /* start with first level directory entry */
- return getFirstValidLevelSeries(leveldir_first);
+ if (node == NULL)
+ {
+ if (leveldir_first) /* start with first level directory entry */
+ return getFirstValidLevelSeries(leveldir_first);
+ else
+ return NULL;
+ }
else if (node->node_group) /* enter level group (step down into tree) */
return getFirstValidLevelSeries(node->node_group);
else if (node->parent_link) /* skip start entry of level group */
else if (node->node_group) /* enter level group (step down into tree) */
return getFirstValidLevelSeries(node->node_group);
else if (node->parent_link) /* skip start entry of level group */