diff options
| author | Simon Howard | 2011-09-11 23:40:44 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-09-11 23:40:44 +0000 |
| commit | efd15d965dee947a04727bb62f4e2092cf28732f (patch) | |
| tree | 730d99c1e88d5e3145e552ad69dec52d30026d01 /src/doom/st_stuff.c | |
| parent | 4d17ab361e90a75dc6deefd37e6eb2ba0610b386 (diff) | |
| parent | 11024d8214580d63ca7a9e70a121f5ff542a2fce (diff) | |
| download | chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.gz chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.bz2 chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.zip | |
Merge from raven-branch.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2367
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; |