diff options
Diffstat (limited to 'gob')
| -rw-r--r-- | gob/cdrom.cpp | 2 | ||||
| -rw-r--r-- | gob/game.cpp | 2 | ||||
| -rw-r--r-- | gob/inter.cpp | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/gob/cdrom.cpp b/gob/cdrom.cpp index 26193ef1ff..ca1eb85ae2 100644 --- a/gob/cdrom.cpp +++ b/gob/cdrom.cpp @@ -183,7 +183,7 @@ void cd_startTrack(const char *trackname) { cd_play(start, end); cd_startTime = util_getTimeKey(); - cd_trackStop = cd_startTime + (end - start + 1 + 150) * 40 / 3 + 500; + cd_trackStop = cd_startTime + (end - start + 1 + 150) * 40 / 3; } void cd_play(uint32 from, uint32 to) { diff --git a/gob/game.cpp b/gob/game.cpp index 8c05d4b0ea..c772ff3d29 100644 --- a/gob/game.cpp +++ b/gob/game.cpp @@ -32,6 +32,7 @@ #include "gob/mult.h" #include "gob/util.h" #include "gob/goblin.h" +#include "gob/cdrom.h" namespace Gob { @@ -1750,6 +1751,7 @@ void game_playTot(int16 skipPlay) { draw_fontToSprite[i].height = -1; } + cd_stopPlaying(); draw_animateCursor(4); inter_initControlVars(); mult_initAll(); diff --git a/gob/inter.cpp b/gob/inter.cpp index 02a152ef54..e56c5aefe8 100644 --- a/gob/inter.cpp +++ b/gob/inter.cpp @@ -368,6 +368,10 @@ void inter_drawOperations(void) { scen_interUpdateAnim(); break; + case 19: + warning("Gob2 mult stub"); + break; + case 20: mult_interInitMult(); break; |