diff options
| -rw-r--r-- | engines/groovie/script.cpp | 16 | ||||
| -rw-r--r-- | engines/groovie/vdx.cpp | 32 |
2 files changed, 24 insertions, 24 deletions
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp index eb21651c56..7cc13c5736 100644 --- a/engines/groovie/script.cpp +++ b/engines/groovie/script.cpp @@ -74,7 +74,7 @@ Script::Script(GroovieEngine *vm) : if (midiDriver == MD_ADLIB) { // MIDI through AdLib setVariable(0x100, 0); - } else if ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")) { + } else if ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")) { // MT-32 setVariable(0x100, 2); } else { @@ -482,7 +482,7 @@ void Script::o_videofromref() { // 0x09 case 0x400D: // floating objects in music room case 0x5060: // a sound from gamwav? - case 0x5098: // a sound from gamwav? + case 0x5098: // a sound from gamwav? case 0x2402: // House becomes book in intro? case 0x1426: // Turn to face front in hall: played after intro case 0x206D: // Cards on table puzzle (bedroom) @@ -655,14 +655,14 @@ void Script::o_hotspot_center() { } void Script::o_hotspot_current() { - uint16 address = readScript16bits(); + uint16 address = readScript16bits(); - debugScript(5, true, "HOTSPOT-CURRENT @0x%04X", address); + debugScript(5, true, "HOTSPOT-CURRENT @0x%04X", address); - // The original interpreter doesn't check the position, so accept the - // whole screen - Common::Rect rect(0, 0, 640, 480); - hotspot(rect, address, 0); + // The original interpreter doesn't check the position, so accept the + // whole screen + Common::Rect rect(0, 0, 640, 480); + hotspot(rect, address, 0); } void Script::o_inputloopend() { diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp index 37f0ed2579..bee84b4adb 100644 --- a/engines/groovie/vdx.cpp +++ b/engines/groovie/vdx.cpp @@ -29,7 +29,7 @@ #include "sound/mixer.h" -#define TILE_SIZE 4 // Size of each tile on the image: only ever seen 4 so far +#define TILE_SIZE 4 // Size of each tile on the image: only ever seen 4 so far #define VDX_IDENT 0x9267 // 37479 namespace Groovie { @@ -68,16 +68,16 @@ uint16 VDXPlayer::loadInternal() { // - 7 // - 8 Just show the first frame // - 9 Start a palette fade in - _flagZero = ((_flags & (1 << 0)) != 0); - _flagOne = ((_flags & (1 << 1)) != 0); - _flag2Byte = (_flags & (1 << 2)) ? 0xFF : 0x00; - _flagThree = ((_flags & (1 << 3)) != 0); - _flagFour = ((_flags & (1 << 4)) != 0); - _flagFive = ((_flags & (1 << 5)) != 0); - _flagSix = ((_flags & (1 << 6)) != 0); - _flagSeven = ((_flags & (1 << 7)) != 0); - _flagEight = ((_flags & (1 << 8)) != 0); - _flagNine = ((_flags & (1 << 9)) != 0); + _flagZero = ((_flags & (1 << 0)) != 0); + _flagOne = ((_flags & (1 << 1)) != 0); + _flag2Byte = (_flags & (1 << 2)) ? 0xFF : 0x00; + _flagThree = ((_flags & (1 << 3)) != 0); + _flagFour = ((_flags & (1 << 4)) != 0); + _flagFive = ((_flags & (1 << 5)) != 0); + _flagSix = ((_flags & (1 << 6)) != 0); + _flagSeven = ((_flags & (1 << 7)) != 0); + _flagEight = ((_flags & (1 << 8)) != 0); + _flagNine = ((_flags & (1 << 9)) != 0); if (_flagOnePrev && !_flagOne && !_flagEight) { _flagSeven = true; @@ -86,11 +86,11 @@ uint16 VDXPlayer::loadInternal() { // Save _flagOne for the next video _flagOnePrev = _flagOne; - //_flagTransparent = _flagOne; - _flagFirstFrame = _flagEight; - //_flagSkipPalette = _flagSeven; - _flagSkipPalette = false; - //_flagSkipStill = _flagFive || _flagSeven; + //_flagTransparent = _flagOne; + _flagFirstFrame = _flagEight; + //_flagSkipPalette = _flagSeven; + _flagSkipPalette = false; + //_flagSkipStill = _flagFive || _flagSeven; //_flagUpdateStill = _flagNine || _flagSix; // Begin reading the file |