[Scummvm-cvs-logs] SF.net SVN: scummvm:[39024] scummvm/trunk/engines/groovie
jvprat at users.sourceforge.net
jvprat at users.sourceforge.net
Sun Mar 1 10:17:05 CET 2009
Revision: 39024
http://scummvm.svn.sourceforge.net/scummvm/?rev=39024&view=rev
Author: jvprat
Date: 2009-03-01 09:17:05 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
Remove extra whitespaces
Modified Paths:
--------------
scummvm/trunk/engines/groovie/script.cpp
scummvm/trunk/engines/groovie/vdx.cpp
Modified: scummvm/trunk/engines/groovie/script.cpp
===================================================================
--- scummvm/trunk/engines/groovie/script.cpp 2009-03-01 09:12:32 UTC (rev 39023)
+++ scummvm/trunk/engines/groovie/script.cpp 2009-03-01 09:17:05 UTC (rev 39024)
@@ -74,7 +74,7 @@
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 @@
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_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() {
Modified: scummvm/trunk/engines/groovie/vdx.cpp
===================================================================
--- scummvm/trunk/engines/groovie/vdx.cpp 2009-03-01 09:12:32 UTC (rev 39023)
+++ scummvm/trunk/engines/groovie/vdx.cpp 2009-03-01 09:17:05 UTC (rev 39024)
@@ -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 @@
// - 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 @@
// 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list