aboutsummaryrefslogtreecommitdiff
path: root/engines/groovie
diff options
context:
space:
mode:
Diffstat (limited to 'engines/groovie')
-rw-r--r--engines/groovie/cell.cpp8
-rw-r--r--engines/groovie/detection.cpp18
-rw-r--r--engines/groovie/font.cpp4
-rw-r--r--engines/groovie/groovie.cpp8
-rw-r--r--engines/groovie/module.mk2
-rw-r--r--engines/groovie/roq.cpp2
-rw-r--r--engines/groovie/script.cpp68
-rw-r--r--engines/groovie/vdx.cpp4
8 files changed, 57 insertions, 57 deletions
diff --git a/engines/groovie/cell.cpp b/engines/groovie/cell.cpp
index c1ddedff9d..a6954c3921 100644
--- a/engines/groovie/cell.cpp
+++ b/engines/groovie/cell.cpp
@@ -50,7 +50,7 @@ int8 CellGame::calcMove(byte *origboard, uint8 color, uint8 depth) {
if (0 == depth) {
return 0;
}
-
+
for (i = 0; BOARDSIZE > i; i++) { // For every square on the board
for (j = 0; BOARDSIZE > j; j++) { //
if (color == *(origboard + i + (BOARDSIZE * j))) { // If the square is the desired colour
@@ -62,7 +62,7 @@ int8 CellGame::calcMove(byte *origboard, uint8 color, uint8 depth) {
int8 nextlevel;
debugC(5, kGroovieDebugCell | kGroovieDebugAll, "Depth: %d: Valid move %d, %d-> %d, %d", depth, i, j, i+di, j+dj);
execMove (newboard, color, i, j, i+di, j+dj);
-
+
nextlevel = calcMove (newboard, oppColor, depth - 1);
debugC(5, kGroovieDebugCell | kGroovieDebugAll, "Depth: %d: Next level down returned %d", depth, nextlevel);
currDiff = countBoard(newboard, color) - origBoardCount - nextlevel;
@@ -84,7 +84,7 @@ int8 CellGame::calcMove(byte *origboard, uint8 color, uint8 depth) {
}
}
}
-
+
_startX = bestStartX;
_startY = bestStartY;
_endX = bestEndX;
@@ -161,7 +161,7 @@ byte CellGame::getStartY() {
byte CellGame::getEndX() {
if (_endX > BOARDSIZE) {
warning ("CellGame::getEndX: not calculated yet!");
- return 1;
+ return 1;
} else {
return _endX;
}
diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index 4052149ed2..fef63c3c74 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -54,7 +54,7 @@ static const PlainGameDescriptor groovieGames[] = {
static const GroovieGameDescription gameDescriptions[] = {
// The 7th Guest DOS English
- {
+ {
{
"t7g", "",
AD_ENTRY1s("script.grv", "d1b8033b40aa67c076039881eccce90d", 16659),
@@ -74,7 +74,7 @@ static const GroovieGameDescription gameDescriptions[] = {
},
// The 7th Guest DOS Russian (Akella)
- {
+ {
{
"t7g", "",
{
@@ -89,7 +89,7 @@ static const GroovieGameDescription gameDescriptions[] = {
#ifdef GROOVIE_EXPERIMENTAL
// The 11th Hour DOS English
- {
+ {
{
"11h", "",
AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227),
@@ -97,7 +97,7 @@ static const GroovieGameDescription gameDescriptions[] = {
},
kGroovieV2, 1
},
-
+
// The 11th Hour DOS Demo English
{
{
@@ -109,7 +109,7 @@ static const GroovieGameDescription gameDescriptions[] = {
},
// The Making of The 11th Hour DOS English
- {
+ {
{
"making11h", "",
AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227),
@@ -119,7 +119,7 @@ static const GroovieGameDescription gameDescriptions[] = {
},
// Clandestiny Trailer DOS English
- {
+ {
{
"clantrailer", "",
AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227),
@@ -129,7 +129,7 @@ static const GroovieGameDescription gameDescriptions[] = {
},
// Clandestiny DOS English
- {
+ {
{
"clandestiny", "",
AD_ENTRY1s("disk.1", "f79fc1515174540fef6a34132efc4c53", 76),
@@ -139,7 +139,7 @@ static const GroovieGameDescription gameDescriptions[] = {
},
// Uncle Henry's Playhouse PC English
- {
+ {
{
"unclehenry", "",
AD_ENTRY1s("disk.1", "0e1b1d3cecc4fc7efa62a968844d1f7a", 72),
@@ -149,7 +149,7 @@ static const GroovieGameDescription gameDescriptions[] = {
},
// Tender Loving Care PC English
- {
+ {
{
"tlc", "",
AD_ENTRY1s("disk.1", "32a1afa68478f1f9d2b25eeea427f2e3", 84),
diff --git a/engines/groovie/font.cpp b/engines/groovie/font.cpp
index 6b77984469..e7365fcfa5 100644
--- a/engines/groovie/font.cpp
+++ b/engines/groovie/font.cpp
@@ -56,7 +56,7 @@ void Font::printstring(char *messagein) {
Common::Rect topbar(640, 80);
Graphics::Surface *gamescreen;
gamescreen = _syst->lockScreen();
- gamescreen->fillRect(topbar, 0);
+ gamescreen->fillRect(topbar, 0);
_syst->unlockScreen();
for (i = 0; i < 14; i++) {
@@ -121,7 +121,7 @@ uint8 Font::printletter(char letter, uint16 xoffset) {
_sphinxfnt->read(data, width * height);
_syst->copyRectToScreen(data, width, xoffset, 16, width, height);
delete[] data;
-
+
return width;
}
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index bbae45da3a..554ae792de 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -136,7 +136,7 @@ Common::Error GroovieEngine::init() {
return Common::kUnknownError;
}
}
-
+
// Check the script file extension
if (!filename.hasSuffix(".grv")) {
error("%s isn't a valid script filename", filename.c_str());
@@ -162,7 +162,7 @@ Common::Error GroovieEngine::init() {
Common::Error GroovieEngine::go() {
// Check that the game files and the audio tracks aren't together run from
// the same cd
-
+
checkCD();
// Game timer counter
@@ -224,7 +224,7 @@ Common::Error GroovieEngine::go() {
_cursorMan->animate();
_system->updateScreen();
tmr++;
- // Wait a little bit between increments. While mouse is moving, this triggers
+ // Wait a little bit between increments. While mouse is moving, this triggers
// only negligably slower.
if (tmr > 4) {
_script.timerTick();
@@ -280,4 +280,4 @@ void GroovieEngine::waitForInput() {
_waitingForInput = true;
}
-} // End of namespace Groovie
+} // End of namespace Groovie
diff --git a/engines/groovie/module.mk b/engines/groovie/module.mk
index 4a5d79cfb8..d4216d3437 100644
--- a/engines/groovie/module.mk
+++ b/engines/groovie/module.mk
@@ -21,5 +21,5 @@ ifeq ($(ENABLE_GROOVIE), DYNAMIC_PLUGIN)
PLUGIN := 1
endif
-# Include common rules
+# Include common rules
include $(srcdir)/rules.mk
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 589251da31..0acf035b14 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -225,7 +225,7 @@ bool ROQPlayer::processBlockQuadVector(ROQBlockHeader &blockHeader) {
// Upsample the 4x4 pixel block
break;
}
- case 3: // CCC:
+ case 3: // CCC:
//printf("coding type 3:\n");
processBlockQuadVectorSub(blockHeader);
break;
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 0799ea913d..0f70bb36ca 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -139,7 +139,7 @@ bool Script::loadScript(Common::String filename) {
_code[0x03C2] = 0x38;
} else if (filename.equals("maze.grv")) {
// GRAPHICS ENHANCEMENT - Leave a skeleton in the maze.
- // Replaces one normal T intersection with the unused(?)
+ // Replaces one normal T intersection with the unused(?)
// skeleton T intersection graphics.
assert(_codeSize == 3652);
@@ -147,7 +147,7 @@ bool Script::loadScript(Common::String filename) {
_code[0x0769] = 0x46;
_code[0x0774] = 0x3E;
_code[0x077A] = 0x42;
-
+
// T with branch on right
_code[0x08E2] = 0x43;
_code[0x08D7] = 0x44;
@@ -380,7 +380,7 @@ void Script::savegame(uint slot) {
for (int i = 0; i < 15; i++) {
newchar = _variables[i] + 0x30;
if ((newchar < 0x30 || newchar > 0x39) && (newchar < 0x41 || newchar > 0x7A)) {
- save[i] = '\0';
+ save[i] = '\0';
break;
} else {
save[i] = newchar;
@@ -478,7 +478,7 @@ void Script::o_videofromref() { // 0x09
debugScript(1, true, "Use external file if available");
}
break;
-
+
case 0x400D: // floating objects in music room
case 0x5060: // a sound from gamwav?
case 0x5098: // a sound from gamwav?
@@ -723,7 +723,7 @@ void Script::o_random() {
void Script::o_jmp() {
uint16 address = readScript16bits();
-
+
debugScript(1, true, "JMP @0x%04X", address);
// Set the current address
@@ -732,7 +732,7 @@ void Script::o_jmp() {
void Script::o_loadstring() {
uint16 varnum = readScript8or16bits();
-
+
debugScript(1, false, "LOADSTRING var[0x%04X..] =", varnum);
do {
setVariable(varnum++, readScriptChar(true, true, true));
@@ -743,7 +743,7 @@ void Script::o_loadstring() {
void Script::o_ret() {
uint8 val = readScript8bits();
-
+
debugScript(1, true, "RET %d", val);
// Set the return value
@@ -760,7 +760,7 @@ void Script::o_ret() {
void Script::o_call() {
uint16 address = readScript16bits();
-
+
debugScript(1, true, "CALL @0x%04X", address);
// Save return address in the call stack
@@ -773,7 +773,7 @@ void Script::o_call() {
void Script::o_sleep() {
uint16 time = readScript16bits();
-
+
debugScript(1, true, "SLEEP 0x%04X", time);
_vm->_system->delayMillis(time * 3);
@@ -852,7 +852,7 @@ void Script::o_vdxtransition() { // 0x1C
void Script::o_swap() {
uint16 varnum1 = readScript8or16bits();
uint16 varnum2 = readScript16bits();
-
+
debugScript(1, true, "SWAP var[0x%04X] <-> var[0x%04X]", varnum1, varnum2);
uint8 tmp = _variables[varnum1];
@@ -862,7 +862,7 @@ void Script::o_swap() {
void Script::o_inc() {
uint16 varnum = readScript8or16bits();
-
+
debugScript(1, true, "INC var[0x%04X]", varnum);
setVariable(varnum, _variables[varnum] + 1);
@@ -870,7 +870,7 @@ void Script::o_inc() {
void Script::o_dec() {
uint16 varnum = readScript8or16bits();
-
+
debugScript(1, true, "DEC var[0x%04X]", varnum);
setVariable(varnum, _variables[varnum] - 1);
@@ -878,7 +878,7 @@ void Script::o_dec() {
void Script::o_strcmpnejmp_var() { // 0x21
uint16 data = readScriptVar();
-
+
if (data > 9) {
data -= 7;
}
@@ -887,7 +887,7 @@ void Script::o_strcmpnejmp_var() { // 0x21
do {
if (_variables[data++] != readScriptChar(true, true, true)) {
stringsmatch = 0;
- }
+ }
} while (!(getCodeByte(_currentInstruction - 1) & 0x80));
uint16 offset = readScript16bits();
@@ -905,7 +905,7 @@ void Script::o_strcmpeqjmp() { // 0x23
uint16 varnum = readScript8or16bits();
uint8 val;
uint8 result = 1;
-
+
debugScript(1, false, "STRCMP-EQJMP: var[0x%04X..],", varnum);
do {
val = readScriptChar(true, true, true);
@@ -938,7 +938,7 @@ void Script::o_mov() {
void Script::o_add() {
uint16 varnum1 = readScript8or16bits();
uint16 varnum2 = readScript16bits();
-
+
debugScript(1, true, "ADD var[0x%04X] += var[0x%04X]", varnum1, varnum2);
setVariable(varnum1, _variables[varnum1] + _variables[varnum2]);
@@ -996,7 +996,7 @@ void Script::o_endscript() {
void Script::o_sethotspottop() {
uint16 address = readScript16bits();
uint8 cursor = readScript8bits();
-
+
debugScript(5, true, "SETHOTSPOTTOP @0x%04X cursor=%d", address, cursor);
_hotspotTopAction = address;
@@ -1006,7 +1006,7 @@ void Script::o_sethotspottop() {
void Script::o_sethotspotbottom() {
uint16 address = readScript16bits();
uint8 cursor = readScript8bits();
-
+
debugScript(5, true, "SETHOTSPOTBOTTOM @0x%04X cursor=%d", address, cursor);
_hotspotBottomAction = address;
@@ -1016,7 +1016,7 @@ void Script::o_sethotspotbottom() {
void Script::o_loadgame() {
uint16 varnum = readScript8or16bits();
uint8 slot = _variables[varnum];
-
+
debugScript(1, true, "LOADGAME var[0x%04X] -> slot=%d (TODO)", varnum, slot);
loadgame(slot);
@@ -1026,7 +1026,7 @@ void Script::o_loadgame() {
void Script::o_savegame() {
uint16 varnum = readScript8or16bits();
uint8 slot = _variables[varnum];
-
+
debugScript(1, true, "SAVEGAME var[0x%04X] -> slot=%d (TODO)", varnum, slot);
savegame(slot);
@@ -1034,7 +1034,7 @@ void Script::o_savegame() {
void Script::o_hotspotbottom_4() { //0x30
uint16 address = readScript16bits();
-
+
debugScript(5, true, "HOTSPOT-BOTTOM @0x%04X", address);
// Mark the 80 pixels under the game area
@@ -1045,7 +1045,7 @@ void Script::o_hotspotbottom_4() { //0x30
void Script::o_midivolume() {
uint16 arg1 = readScript16bits();
uint16 arg2 = readScript16bits();
-
+
debugScript(1, true, "MIDI volume: %d %d", arg1, arg2);
_vm->_musicPlayer->setGameVolume(arg1, arg2);
}
@@ -1054,7 +1054,7 @@ void Script::o_jne() {
int16 varnum1 = readScript8or16bits();
uint16 varnum2 = readScript16bits();
uint16 address = readScript16bits();
-
+
debugScript(1, false, "JNE: var[var[0x%04X] - 0x31] != var[0x%04X] @0x%04X", varnum1, varnum2, address);
if (_variables[_variables[varnum1] - 0x31] != _variables[varnum2]) {
@@ -1067,7 +1067,7 @@ void Script::o_jne() {
void Script::o_loadstringvar() {
uint16 varnum = readScript8or16bits();
-
+
varnum = _variables[varnum] - 0x31;
debugScript(1, false, "LOADSTRINGVAR var[0x%04X..] =", varnum);
do {
@@ -1239,7 +1239,7 @@ void Script::o_hotspot_slot() {
Graphics::Surface *gamescreen;
gamescreen = _vm->_system->lockScreen();
- gamescreen->fillRect(topbar, 0);
+ gamescreen->fillRect(topbar, 0);
_vm->_system->unlockScreen();
@@ -1288,7 +1288,7 @@ void Script::o_checkvalidsaves() {
for (i = 0; i < 15; i++) {
file->read(&temp, 1);
savename[i] = temp + 0x30;
- }
+ }
delete file;
} else {
@@ -1359,7 +1359,7 @@ void Script::o_setvideoorigin() {
// Read the two offset arguments
int16 origX = readScript16bits();
int16 origY = readScript16bits();
-
+
// Set bitflag 7
_bitflags |= 1 << 7;
@@ -1403,8 +1403,8 @@ void Script::o_cellmove() {
startY = staufsMove.getStartY();
endX = staufsMove.getEndX();
endY = staufsMove.getEndY();
-
-
+
+
// Set the movement origin
setVariable(0, startY); // y
setVariable(1, startX); // x
@@ -1491,7 +1491,7 @@ void Script::o_getcd() {
void Script::o_playcd() {
uint8 val = readScript8bits();
-
+
debugScript(1, true, "PLAYCD %d", val);
if (val == 2) {
@@ -1507,7 +1507,7 @@ void Script::o_hotspot_outrect() {
uint16 right = readScript16bits();
uint16 bottom = readScript16bits();
uint16 address = readScript16bits();
-
+
debugScript(1, true, "HOTSPOT-OUTRECT(%d,%d,%d,%d) @0x%04X (TODO)", left, top, right, bottom, address);
// Test if the current mouse position is outside the specified rectangle
@@ -1525,20 +1525,20 @@ void Script::o_stub56() {
uint32 val1 = readScript32bits();
uint8 val2 = readScript8bits();
uint8 val3 = readScript8bits();
-
+
debugScript(1, true, "STUB56: 0x%08X 0x%02X 0x%02X", val1, val2, val3);
}
void Script::o_stub59() {
uint16 val1 = readScript8or16bits();
uint8 val2 = readScript8bits();
-
+
debugScript(1, true, "STUB59: 0x%04X 0x%02X", val1, val2);
}
Script::OpcodeFunc Script::_opcodes[NUM_OPCODES] = {
&Script::o_nop, // 0x00
- &Script::o_nop,
+ &Script::o_nop,
&Script::o_playsong,
&Script::o_bf9on,
&Script::o_palfadeout, // 0x04
diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp
index 137333c362..247d2c885e 100644
--- a/engines/groovie/vdx.cpp
+++ b/engines/groovie/vdx.cpp
@@ -65,7 +65,7 @@ uint16 VDXPlayer::loadInternal() {
// - 1 Puzzle piece? Skip palette, don't redraw full screen, draw still to b/ack buffer
// - 2 Transparent colour is 0xFF
// - 5 Skip still chunks
- // - 7
+ // - 7
// - 8 Just show the first frame
// - 9 Start a palette fade in
_flagZero = ((_flags & (1 << 0)) != 0);
@@ -161,7 +161,7 @@ bool VDXPlayer::playFrameInternal() {
}
// Wait until the current frame can be shown
-
+
if (!(Common::getEnabledSpecialDebugLevels() & kGroovieDebugFast)) {
waitFrame();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 01:43:12 +0000