diff options
| author | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
| commit | d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd (patch) | |
| tree | e6e98f266610f6428c248aed6abc75e637e45231 /engines/agos | |
| parent | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (diff) | |
| download | scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.gz scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.bz2 scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.zip | |
Fixed the spaces before tabs.
svn-id: r30667
Diffstat (limited to 'engines/agos')
| -rw-r--r-- | engines/agos/agos.cpp | 4 | ||||
| -rw-r--r-- | engines/agos/agos.h | 8 | ||||
| -rw-r--r-- | engines/agos/charset-fontdata.cpp | 4 | ||||
| -rw-r--r-- | engines/agos/cursor.cpp | 2 | ||||
| -rw-r--r-- | engines/agos/detection_tables.h | 38 | ||||
| -rw-r--r-- | engines/agos/draw.cpp | 12 | ||||
| -rw-r--r-- | engines/agos/oracle.cpp | 6 | ||||
| -rw-r--r-- | engines/agos/res_ami.cpp | 2 | ||||
| -rw-r--r-- | engines/agos/saveload.cpp | 4 | ||||
| -rw-r--r-- | engines/agos/string.cpp | 14 |
10 files changed, 47 insertions, 47 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 7e5613f027..12e91b9fd0 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -338,8 +338,8 @@ AGOSEngine::AGOSEngine(OSystem *syst) _syncCount = 0; - _iconToggleCount = 0; - _voiceCount = 0; + _iconToggleCount = 0; + _voiceCount = 0; _lastTickCount = 0; _thisTickCount = 0; diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 2e8a20f6fd..93ccdb8b21 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -324,8 +324,8 @@ protected: uint8 _wallOn; uint16 _hyperLink, _newLines; - uint16 _oracleMaxScrollY, _noOracleScroll; - uint16 _interactY; + uint16 _oracleMaxScrollY, _noOracleScroll; + uint16 _interactY; int16 _scriptVerb, _scriptNoun1, _scriptNoun2; int16 _scriptAdj1, _scriptAdj2; @@ -1634,8 +1634,8 @@ protected: void sendInteractText(uint16 num, const char *fmt, ...); void checkLinkBox(); - void hyperLinkOn(uint16 x); - void hyperLinkOff(); + void hyperLinkOn(uint16 x); + void hyperLinkOff(); void linksUp(); void linksDown(); diff --git a/engines/agos/charset-fontdata.cpp b/engines/agos/charset-fontdata.cpp index 8a37de335a..bcb08b7abe 100644 --- a/engines/agos/charset-fontdata.cpp +++ b/engines/agos/charset-fontdata.cpp @@ -1403,7 +1403,7 @@ static const byte french_commonFont[] = { 0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00, 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00, 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00, - 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00, + 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00, 0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00, 0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00, 0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00, @@ -1504,7 +1504,7 @@ static const byte english_commonFont[] = { 0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00, 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00, 0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00, - 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00, + 0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00, 0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00, 0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00, 0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00, diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp index 1755f63f61..1cbfdaed7b 100644 --- a/engines/agos/cursor.cpp +++ b/engines/agos/cursor.cpp @@ -37,7 +37,7 @@ namespace AGOS { static const uint16 _common_mouseInfo[32] = { 0xC000, 0x8000, 0xE000, 0xC000, 0xF000, 0xE000, 0xF800, 0xF000, 0xFC00, 0xF800, 0xFE00, 0xFC00, 0xFC00, 0xF000, 0x9800, 0x9000, - 0x0C00, 0x0800, 0x0C00, 0x0800, 0x0600, 0x0400, 0x0000, 0x0000, + 0x0C00, 0x0800, 0x0C00, 0x0800, 0x0600, 0x0400, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h index 9e1248382c..ef778b651d 100644 --- a/engines/agos/detection_tables.h +++ b/engines/agos/detection_tables.h @@ -750,10 +750,10 @@ static const AGOSGameDescription gameDescriptions[] = { "Floppy", { - { "gamebase.dat", GAME_BASEFILE, "c392e494dcabed797b98cbcfc687b33a", -1}, - { "icondata.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, - { "stripped.dat", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1}, - { "tbllist.dat", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, + { "gamebase.dat", GAME_BASEFILE, "c392e494dcabed797b98cbcfc687b33a", -1}, + { "icondata.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, + { "stripped.dat", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1}, + { "tbllist.dat", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, { NULL, 0, NULL, 0} }, Common::EN_ANY, @@ -773,11 +773,11 @@ static const AGOSGameDescription gameDescriptions[] = { "CD Demo", { - { "data", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1}, - { "gamebase", GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1}, - { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, - { "stripped", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1}, - { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, + { "data", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1}, + { "gamebase", GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1}, + { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, + { "stripped", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1}, + { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, { NULL, 0, NULL, 0} }, Common::EN_ANY, @@ -797,11 +797,11 @@ static const AGOSGameDescription gameDescriptions[] = { "CD", { - { "data", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806", -1}, - { "gamebase", GAME_BASEFILE, "28261b99cd9da1242189b4f6f2841bd6", -1}, - { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, - { "stripped", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8", -1}, - { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, + { "data", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806", -1}, + { "gamebase", GAME_BASEFILE, "28261b99cd9da1242189b4f6f2841bd6", -1}, + { "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, + { "stripped", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8", -1}, + { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, { NULL, 0, NULL, 0} }, Common::EN_ANY, @@ -1189,11 +1189,11 @@ static const AGOSGameDescription gameDescriptions[] = { "CD Demo", { - { "simon.gme", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1}, - { "gamepc" , GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1}, - { "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, - { "stripped.txt", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1}, - { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, + { "simon.gme", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1}, + { "gamepc" , GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1}, + { "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1}, + { "stripped.txt", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1}, + { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1}, { NULL, 0, NULL, 0} }, Common::EN_ANY, diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp index c19fad5e4e..0eb42c1bc3 100644 --- a/engines/agos/draw.cpp +++ b/engines/agos/draw.cpp @@ -848,8 +848,8 @@ void AGOSEngine::slowFadeIn() { memcpy(_videoBuf1 + 1024, _displayPalette, 1024); for (c = 255; c >= 0; c -= 4) { - src = _videoBuf1 + 1024; - dst = _videoBuf1; + src = _videoBuf1 + 1024; + dst = _videoBuf1; for (p = _fastFadeInFlag; p !=0 ; p -= 3) { if (src[0] >= c) @@ -860,10 +860,10 @@ void AGOSEngine::slowFadeIn() { dst[2] += 4; src += 4; dst += 4; - } - _system->setPalette(_videoBuf1, 0, _fastFadeCount); - delay(5); - } + } + _system->setPalette(_videoBuf1, 0, _fastFadeCount); + delay(5); + } _fastFadeInFlag = 0; } diff --git a/engines/agos/oracle.cpp b/engines/agos/oracle.cpp index 0057fc34a8..d15e68828e 100644 --- a/engines/agos/oracle.cpp +++ b/engines/agos/oracle.cpp @@ -184,7 +184,7 @@ void AGOSEngine_Feeble::oracleTextUp() { changeWindow(3); _noOracleScroll = 0; - if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up + if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up _oracleMaxScrollY = _textWindow->scrollY; while (1) { if (_textWindow->scrollY == _oracleMaxScrollY) @@ -218,7 +218,7 @@ void AGOSEngine_Feeble::oracleTextDown() { changeWindow(3); _noOracleScroll = 0; - if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up + if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up _oracleMaxScrollY = _textWindow->scrollY; while (1) { if (_textWindow->scrollY == 0) @@ -411,7 +411,7 @@ void AGOSEngine_Feeble::listSaveGames(int n) { showMessageFormat("\n"); hyperLinkOn(j + 400); setTextColor(116); - showMessageFormat(" %d. ",1); + showMessageFormat(" %d. ",1); hyperLinkOff(); setTextColor(113); k++; diff --git a/engines/agos/res_ami.cpp b/engines/agos/res_ami.cpp index a40ca54c58..3bd951365f 100644 --- a/engines/agos/res_ami.cpp +++ b/engines/agos/res_ami.cpp @@ -129,7 +129,7 @@ static void convertCompressedImage(const byte *src, byte *dst, uint8 colorDepth, free(uncbfrout); for (i = 0; i < colorDepth; ++i) { free(uncptr[i]); - } + } } byte *AGOSEngine::convertImage(VC10_state *state, bool compressed) { diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index cb87e0ec05..65b35a426a 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -1235,7 +1235,7 @@ bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) { SubSuperRoom *sr = (SubSuperRoom *)findChildOfType(item, kSuperRoomType); if (sr) { uint16 n = sr->roomX * sr->roomY * sr->roomZ; - for (i = j = 0; i != n; i++) + for (i = j = 0; i != n; i++) sr->roomExitStates[j++] = f->readUint16BE(); } @@ -1384,7 +1384,7 @@ bool AGOSEngine_Elvira2::saveGame(uint slot, const char *caption) { SubSuperRoom *sr = (SubSuperRoom *)findChildOfType(item, kSuperRoomType); if (sr) { uint16 n = sr->roomX * sr->roomY * sr->roomZ; - for (i = j = 0; i != n; i++) + for (i = j = 0; i != n; i++) f->writeUint16BE(sr->roomExitStates[j++]); } diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp index 6714659449..dbfa36279b 100644 --- a/engines/agos/string.cpp +++ b/engines/agos/string.cpp @@ -217,7 +217,7 @@ static const byte charWidth[226] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 7 + 0, 0, 0, 0, 0, 7 }; const char *getPixelLength(const char *string, uint16 maxWidth, uint16 &pixels) { @@ -410,8 +410,8 @@ void AGOSEngine_Feeble::printScreenText(uint vgaSpriteId, uint color, const char if (spaces != 0) spaces--; while (spaces) { - *convertedString2++ = ' '; - spaces--; + *convertedString2++ = ' '; + spaces--; } strcpy(convertedString2, string); break; @@ -425,8 +425,8 @@ void AGOSEngine_Feeble::printScreenText(uint vgaSpriteId, uint color, const char if (spaces != 0) spaces--; while (spaces) { - *convertedString2++ = ' '; - spaces--; + *convertedString2++ = ' '; + spaces--; } b = string2 - string; strncpy(convertedString2, string, b); @@ -574,7 +574,7 @@ uint16 AGOSEngine_Waxworks::getBoxSize() { case 3: if (_lineCounts[0] <= 37) { if (_lineCounts[1] <= 37) { if (_lineCounts[2] <= 37) - return 3; + return 3; if (_lineCounts[2] <= 84) if (checkFit(_linePtrs[2], 42, 2)) return 4; @@ -590,7 +590,7 @@ uint16 AGOSEngine_Waxworks::getBoxSize() { if (checkFit(_linePtrs[2], 48, 2)) return 5; return 6; - } + } if ((_lineCounts[1] <= 144) && (checkFit(_linePtrs[1], 48, 3))) { if (_lineCounts[2] <= 48) return 5; |
