diff options
| author | Simon Howard | 2011-06-13 22:21:37 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-06-13 22:21:37 +0000 |
| commit | 391e7466b1efb7cbede4a1c356a210d9e7ee616b (patch) | |
| tree | 90d13346d9cd3636df44290ded13d59ae3712543 /src/doom/st_stuff.c | |
| parent | fa328faf056affa216f2f3a8764ca0d56262efe9 (diff) | |
| parent | 822664b4ff873d462370e9e96a9d91e6066c221d (diff) | |
| download | chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.tar.gz chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.tar.bz2 chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2347
Diffstat (limited to 'src/doom/st_stuff.c')
| -rw-r--r-- | src/doom/st_stuff.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/doom/st_stuff.c b/src/doom/st_stuff.c index 7e5e225c..8595ff50 100644 --- a/src/doom/st_stuff.c +++ b/src/doom/st_stuff.c @@ -525,8 +525,13 @@ ST_Responder (event_t* ev) plyr->message = DEH_String(STSTR_MUS); cht_GetParam(&cheat_mus, buf); - - if (gamemode == commercial) + + // Note: The original v1.9 had a bug that tried to play back + // the Doom II music regardless of gamemode. This was fixed + // in the Ultimate Doom executable so that it would work for + // the Doom 1 music as well. + + if (gamemode == commercial || gameversion < exe_ultimate) { musnum = mus_runnin + (buf[0]-'0')*10 + buf[1]-'0' - 1; |