diff options
author | Simon Howard | 2006-05-05 19:49:34 +0000 |
---|---|---|
committer | Simon Howard | 2006-05-05 19:49:34 +0000 |
commit | 319f427c9369bfe1c5a6cad636ecd91934c3024d (patch) | |
tree | 070bef41921a855a7e39d380e87d8c38978e97a1 /src/d_main.c | |
parent | cbd744280545a38e62ecc0290a1312b3aeff9ae0 (diff) | |
download | chocolate-doom-319f427c9369bfe1c5a6cad636ecd91934c3024d.tar.gz chocolate-doom-319f427c9369bfe1c5a6cad636ecd91934c3024d.tar.bz2 chocolate-doom-319f427c9369bfe1c5a6cad636ecd91934c3024d.zip |
Syncronise the -timer/-avg parameters across all clients to avoid desyncs.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 475
Diffstat (limited to 'src/d_main.c')
-rw-r--r-- | src/d_main.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/d_main.c b/src/d_main.c index d9b5853b..d7d94145 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: d_main.c 467 2006-04-09 02:50:34Z fraggle $ +// $Id: d_main.c 475 2006-05-05 19:49:34Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -184,7 +184,7 @@ //----------------------------------------------------------------------------- -static const char rcsid[] = "$Id: d_main.c 467 2006-04-09 02:50:34Z fraggle $"; +static const char rcsid[] = "$Id: d_main.c 475 2006-05-05 19:49:34Z fraggle $"; #define BGCOLOR 7 #define FGCOLOR 8 @@ -1600,21 +1600,22 @@ void D_DoomMain (void) autostart = true; } + timelimit = 0; + p = M_CheckParm ("-timer"); if (p && p < myargc-1 && deathmatch) { - int time; - time = atoi(myargv[p+1]); - printf(DEH_String("Levels will end after %d minute"),time); - if (time>1) - printf("s"); - printf(".\n"); + timelimit = atoi(myargv[p+1]); + printf("timer: %i\n", timelimit); } p = M_CheckParm ("-avg"); if (p && p < myargc-1 && deathmatch) + { printf(DEH_String("Austin Virtual Gaming: Levels will end " "after 20 minutes\n")); + timelimit = 20; + } p = M_CheckParm ("-warp"); if (p && p < myargc-1) |