diff options
| author | Simon Howard | 2010-12-10 22:44:01 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-12-10 22:44:01 +0000 |
| commit | 8dab0a3e635db40359c8ddeb9afaa9eca626ee98 (patch) | |
| tree | cfd01bd0c96a97fcffad588782a5d106ca1b3d2f /src/doom/p_spec.c | |
| parent | 005747a6174d2d5b72e1af196a72cafb9b801a58 (diff) | |
| parent | 678a8f9aeea9fa1966b3e8a94974688fda4d8fe1 (diff) | |
| download | chocolate-doom-8dab0a3e635db40359c8ddeb9afaa9eca626ee98.tar.gz chocolate-doom-8dab0a3e635db40359c8ddeb9afaa9eca626ee98.tar.bz2 chocolate-doom-8dab0a3e635db40359c8ddeb9afaa9eca626ee98.zip | |
Merge from trunk. This is slightly out of date as I did the merge
several days ago.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2212
Diffstat (limited to 'src/doom/p_spec.c')
| -rw-r--r-- | src/doom/p_spec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/doom/p_spec.c b/src/doom/p_spec.c index 37beb850..fa3ec335 100644 --- a/src/doom/p_spec.c +++ b/src/doom/p_spec.c @@ -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++) |