diff options
| author | Simon Howard | 2011-02-12 18:42:10 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-02-12 18:42:10 +0000 |
| commit | 516a7028994df6718289a7e3db4d07a45c95466b (patch) | |
| tree | cf974cb4bd38b8e9d0101a41263b42b8c87e96c7 /src/doom/p_spec.c | |
| parent | a15ba75736d15409876c1f0a44fffc99adf1c192 (diff) | |
| parent | a9996b41e954d85fde5ec5188bbf6a7f4df88011 (diff) | |
| download | chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.gz chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.bz2 chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.zip | |
Merge from raven-branch. FEATURE_MULTIPLAYER has been disabled
temporarily until the netgame changes on raven-branch are finished.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2259
Diffstat (limited to 'src/doom/p_spec.c')
| -rw-r--r-- | src/doom/p_spec.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/doom/p_spec.c b/src/doom/p_spec.c index 37beb850..90d0bb7c 100644 --- a/src/doom/p_spec.c +++ b/src/doom/p_spec.c @@ -1213,9 +1213,9 @@ static void DonutOverrun(fixed_t *s3_floorheight, short *s3_floorpic, // system. The default (if this option is not specified) is to // emulate the behavior when running under Windows 98. - p = M_CheckParm("-donut"); + p = M_CheckParmWithArgs("-donut", 2); - if (p > 0 && p < myargc - 2) + if (p > 0) { // Dump of needed memory: (fixed_t)0000:0000 and (short)0000:0008 // @@ -1389,10 +1389,9 @@ void P_SpawnSpecials (void) if (W_CheckNumForName(DEH_String("texture2")) >= 0) episode = 2; - // See if -TIMER was specified. - if (timelimit > 0) + if (timelimit > 0 && deathmatch) { levelTimer = true; levelTimeCount = timelimit * 60 * TICRATE; @@ -1401,7 +1400,7 @@ void P_SpawnSpecials (void) { levelTimer = false; } - + // Init special SECTORs. sector = sectors; for (i=0 ; i<numsectors ; i++, sector++) |