diff options
| author | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
| commit | 258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch) | |
| tree | a3ae8675b679c9f3b58ac8d97c79369502ea23c1 /engines | |
| parent | a89694c0d61a75a960f5bec6c498659c988401cc (diff) | |
| download | scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2 scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip | |
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'engines')
422 files changed, 2411 insertions, 2478 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index bc3cd86e7c..da70d82b57 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/events.h" #include "common/file.h" @@ -667,7 +667,7 @@ AgiEngine::AgiEngine(OSystem *syst) : AgiBase(syst) { _objects = NULL; _oldMode = -1; - + _predictiveDialogRunning = false; _predictiveDictText = NULL; _predictiveDictLine = NULL; diff --git a/engines/agi/agi.h b/engines/agi/agi.h index dfe149de4f..eac80ac9a3 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -26,7 +26,7 @@ #ifndef AGI_H #define AGI_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/endian.h" #include "common/util.h" @@ -352,7 +352,7 @@ public: amigaBlack = 0x00, ///< Accurate, is #000000 (24-bit RGB) amigaWhite = 0x0F, ///< Practically accurate, is close to #FFFFFF (24-bit RGB) amigaGreen = 0x02, ///< Quite accurate, should be #008A00 (24-bit RGB) - amigaOrange = 0x0C, ///< Inaccurate, too much blue, should be #FF7500 (24-bit RGB) + amigaOrange = 0x0C, ///< Inaccurate, too much blue, should be #FF7500 (24-bit RGB) amigaPurple = 0x0D, ///< Inaccurate, too much green, should be #FF00FF (24-bit RGB) amigaRed = 0x04, ///< Quite accurate, should be #BD0000 (24-bit RGB) amigaCyan = 0x0B, ///< Inaccurate, too much red, should be #00FFDE (24-bit RGB) @@ -505,10 +505,10 @@ struct AgiGame { #define SBUF256_OFFSET ((_WIDTH) * (_HEIGHT)) #define FROM_SBUF16_TO_SBUF256_OFFSET ((SBUF256_OFFSET) - (SBUF16_OFFSET)) #define FROM_SBUF256_TO_SBUF16_OFFSET ((SBUF16_OFFSET) - (SBUF256_OFFSET)) - uint8 *sbufOrig; /**< Pointer to the 160x336 AGI screen buffer that contains vertically two 160x168 screens (16 color and 256 color). */ + uint8 *sbufOrig; /**< Pointer to the 160x336 AGI screen buffer that contains vertically two 160x168 screens (16 color and 256 color). */ uint8 *sbuf16c; /**< 160x168 16 color (+control line & priority information) AGI screen buffer. Points at sbufOrig + SBUF16_OFFSET. */ uint8 *sbuf256c; /**< 160x168 256 color AGI screen buffer (For AGI256 and AGI256-2 support). Points at sbufOrig + SBUF256_OFFSET. */ - uint8 *sbuf; /**< Currently chosen AGI screen buffer (sbuf256c if AGI256 or AGI256-2 is used, otherwise sbuf16c). */ + uint8 *sbuf; /**< Currently chosen AGI screen buffer (sbuf256c if AGI256 or AGI256-2 is used, otherwise sbuf16c). */ /* player command line */ AgiWord egoWords[MAX_WORDS]; diff --git a/engines/agi/checks.cpp b/engines/agi/checks.cpp index 5d71af10cf..38bffca355 100644 --- a/engines/agi/checks.cpp +++ b/engines/agi/checks.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" namespace Agi { @@ -113,7 +113,7 @@ int AgiEngine::checkPriority(VtEntry *v) { } return pass; - } + } water = 1; diff --git a/engines/agi/console.cpp b/engines/agi/console.cpp index 874ff29e3a..1107694805 100644 --- a/engines/agi/console.cpp +++ b/engines/agi/console.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" #include "agi/graphics.h" diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp index bd8fcb0394..2d7202c35b 100644 --- a/engines/agi/cycle.cpp +++ b/engines/agi/cycle.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" #include "agi/sprite.h" diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index afd61ae765..3854099702 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "base/plugins.h" @@ -1894,7 +1894,7 @@ static const AGIGameDescription gameDescriptions[] = { /** * The fallback game descriptor used by the AGI engine's fallbackDetector. - * Contents of this struct are to be overwritten by the fallbackDetector. + * Contents of this struct are to be overwritten by the fallbackDetector. */ static AGIGameDescription g_fallbackDesc = { { @@ -1919,7 +1919,7 @@ Common::EncapsulatedADGameDesc fallbackDetector(const FSList *fslist) { int wagFileCount = 0; WagFileParser wagFileParser; Common::String wagFilePath; - Common::String gameid("agi-fanmade"), description, extra; // Set the defaults for gameid, description and extra + Common::String gameid("agi-fanmade"), description, extra; // Set the defaults for gameid, description and extra FSList fslistCurrentDir; // Only used if fslist == NULL // Use the current directory for searching if fslist == NULL @@ -1950,7 +1950,7 @@ Common::EncapsulatedADGameDesc fallbackDetector(const FSList *fslist) { Common::String filename = file->getName(); filename.toLowercase(); allFiles[filename] = true; // Save the filename in a hash table - + if (filename.hasSuffix(".wag")) { // Save latest found *.wag file's path (Can be used to open the file, the name can't) wagFilePath = file->getPath(); @@ -1972,7 +1972,7 @@ Common::EncapsulatedADGameDesc fallbackDetector(const FSList *fslist) { g_fallbackDesc.features |= GF_AGIPAL; // Add AGIPAL feature flag } else { // Not AGIPAL so just plain v2 description = "Unknown v2 Game"; - } + } } else { // Try v3 char name[8]; diff --git a/engines/agi/font.h b/engines/agi/font.h index 1bf61878ec..8d99aa41b5 100644 --- a/engines/agi/font.h +++ b/engines/agi/font.h @@ -26,7 +26,7 @@ #ifndef AGI_FONT_H #define AGI_FONT_H -#include "common/stdafx.h" + #include "agi/agi.h" @@ -295,520 +295,520 @@ static const uint8 curFont[] = { }; static const uint8 mickey_fontdata[] = { - 0x00, 0x36, 0x7F, 0x7F, 0x3E, 0x1C, 0x08, 0x00, - 0x00, 0x00, 0x3F, 0x20, 0x2F, 0x28, 0x28, 0x28, - 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, - 0x28, 0x28, 0x2F, 0x20, 0x2F, 0x28, 0x28, 0x28, - 0x28, 0x28, 0x2F, 0x20, 0x3F, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0x00, 0xEF, 0x28, 0x28, 0x28, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x36, 0x7F, 0x7F, 0x3E, 0x1C, 0x08, 0x00, + 0x00, 0x00, 0x3F, 0x20, 0x2F, 0x28, 0x28, 0x28, + 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, + 0x28, 0x28, 0x2F, 0x20, 0x2F, 0x28, 0x28, 0x28, + 0x28, 0x28, 0x2F, 0x20, 0x3F, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFF, 0x00, 0xEF, 0x28, 0x28, 0x28, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x28, 0xEF, 0x00, 0xEF, 0x28, 0x28, 0x28, - 0x28, 0x28, 0xEF, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x28, 0x28, 0xEF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x08, 0xE8, 0x28, 0x28, 0x28, - 0x28, 0x28, 0xE8, 0x08, 0xE8, 0x28, 0x28, 0x28, - 0x28, 0x28, 0xE8, 0x08, 0xF8, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x10, 0x10, 0x10, - 0x10, 0x10, 0xFF, 0x00, 0xFF, 0x10, 0x10, 0x10, - 0x10, 0x10, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x10, 0x10, 0xFF, 0x10, 0x10, 0x10, 0x10, - 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, - 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, - 0x18, 0x18, 0x18, 0x1F, 0x1F, 0x00, 0x00, 0x00, - 0x78, 0x60, 0x78, 0x60, 0x7E, 0x18, 0x1E, 0x00, - 0x00, 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x18, 0x00, - 0x00, 0x18, 0x18, 0x18, 0x7E, 0x3C, 0x18, 0x00, - 0x00, 0x18, 0x30, 0x7E, 0x30, 0x18, 0x00, 0x00, - 0x00, 0x18, 0x0C, 0x7E, 0x0C, 0x18, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, - 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x66, 0xFF, 0x66, 0x66, 0xFF, 0x66, 0x00, - 0x18, 0x3E, 0x60, 0x3C, 0x06, 0x7C, 0x18, 0x00, - 0x00, 0x66, 0x6C, 0x18, 0x30, 0x66, 0x46, 0x00, - 0x1C, 0x36, 0x1C, 0x38, 0x6F, 0x66, 0x3B, 0x00, - 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0E, 0x1C, 0x18, 0x18, 0x18, 0x1C, 0x0E, 0x00, - 0x70, 0x38, 0x18, 0x18, 0x18, 0x38, 0x70, 0x00, - 0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00, - 0x00, 0x18, 0x18, 0x7E, 0x18, 0x18, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, - 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, - 0x02, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x40, 0x00, - 0x3C, 0x66, 0x6E, 0x7E, 0x76, 0x66, 0x3C, 0x00, - 0x18, 0x38, 0x18, 0x18, 0x18, 0x18, 0x7E, 0x00, - 0x3C, 0x66, 0x06, 0x0C, 0x18, 0x30, 0x7E, 0x00, - 0x7E, 0x0C, 0x18, 0x0C, 0x06, 0x66, 0x3C, 0x00, - 0x0C, 0x1C, 0x3C, 0x6C, 0x6C, 0x7E, 0x0C, 0x00, - 0x7E, 0x60, 0x7C, 0x06, 0x06, 0x66, 0x3C, 0x00, - 0x3C, 0x60, 0x60, 0x7C, 0x66, 0x66, 0x3C, 0x00, - 0x7E, 0x06, 0x0C, 0x18, 0x30, 0x30, 0x30, 0x00, - 0x3C, 0x66, 0x66, 0x3C, 0x66, 0x66, 0x3C, 0x00, - 0x3C, 0x66, 0x66, 0x3E, 0x06, 0x0C, 0x38, 0x00, - 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00, - 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30, - 0x06, 0x0C, 0x18, 0x30, 0x18, 0x0C, 0x06, 0x00, - 0x00, 0x00, 0x7E, 0x00, 0x00, 0x7E, 0x00, 0x00, - 0x60, 0x30, 0x18, 0x0C, 0x18, 0x30, 0x60, 0x00, - 0x3C, 0x66, 0x04, 0x0C, 0x18, 0x00, 0x18, 0x00, - 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x18, 0x3C, 0x66, 0x66, 0x7E, 0x66, 0x66, 0x00, - 0x7C, 0x66, 0x66, 0x7C, 0x66, 0x66, 0x7C, 0x00, - 0x3C, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3C, 0x00, - 0x78, 0x6C, 0x66, 0x66, 0x66, 0x6C, 0x78, 0x00, - 0x7E, 0x60, 0x60, 0x7C, 0x60, 0x60, 0x7E, 0x00, - 0x7E, 0x60, 0x60, 0x7C, 0x60, 0x60, 0x60, 0x00, - 0x3E, 0x60, 0x60, 0x6E, 0x66, 0x66, 0x3E, 0x00, - 0x66, 0x66, 0x66, 0x7E, 0x66, 0x66, 0x66, 0x00, - 0x7E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7E, 0x00, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x3C, 0x00, - 0x66, 0x6C, 0x78, 0x78, 0x6C, 0x66, 0x66, 0x00, - 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7E, 0x00, - 0x63, 0x77, 0x7F, 0x6B, 0x63, 0x63, 0x63, 0x00, - 0x66, 0x76, 0x7E, 0x7E, 0x6E, 0x66, 0x66, 0x00, - 0x3C, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3C, 0x00, - 0x7C, 0x66, 0x66, 0x66, 0x7C, 0x60, 0x60, 0x00, - 0x3C, 0x66, 0x66, 0x66, 0x66, 0x6C, 0x36, 0x00, - 0x7C, 0x66, 0x66, 0x7C, 0x6C, 0x66, 0x66, 0x00, - 0x3C, 0x60, 0x60, 0x3C, 0x06, 0x06, 0x3C, 0x00, - 0x7E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, - 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7E, 0x00, - 0x66, 0x66, 0x66, 0x66, 0x66, 0x3C, 0x18, 0x00, - 0x63, 0x63, 0x63, 0x6B, 0x7F, 0x77, 0x63, 0x00, - 0x66, 0x66, 0x3C, 0x3C, 0x66, 0x66, 0x66, 0x00, - 0x66, 0x66, 0x66, 0x3C, 0x18, 0x18, 0x18, 0x00, - 0x7E, 0x0C, 0x18, 0x30, 0x60, 0x60, 0x7E, 0x00, - 0x1E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1E, 0x00, - 0x00, 0x40, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x00, - 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x00, - 0x00, 0x08, 0x1C, 0x36, 0x63, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, - 0x00, 0x18, 0x3C, 0x7E, 0x7E, 0x3C, 0x18, 0x00, - 0x00, 0x00, 0x3C, 0x06, 0x3E, 0x66, 0x3E, 0x00, - 0x60, 0x60, 0x7C, 0x66, 0x66, 0x66, 0x7C, 0x00, - 0x00, 0x00, 0x3C, 0x60, 0x60, 0x60, 0x3C, 0x00, - 0x06, 0x06, 0x3E, 0x66, 0x66, 0x66, 0x3E, 0x00, - 0x00, 0x00, 0x3C, 0x66, 0x7E, 0x60, 0x3C, 0x00, - 0x0E, 0x18, 0x18, 0x3E, 0x18, 0x18, 0x18, 0x00, - 0x00, 0x00, 0x3E, 0x66, 0x66, 0x3E, 0x06, 0x7C, - 0x60, 0x60, 0x7C, 0x66, 0x66, 0x66, 0x66, 0x00, - 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x3C, 0x00, - 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x3C, - 0x60, 0x60, 0x6C, 0x78, 0x6C, 0x66, 0x66, 0x00, - 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3C, 0x00, - 0x00, 0x00, 0x66, 0x7F, 0x7F, 0x6B, 0x63, 0x00, - 0x00, 0x00, 0x7C, 0x66, 0x66, 0x66, 0x66, 0x00, - 0x00, 0x00, 0x3C, 0x66, 0x66, 0x66, 0x3C, 0x00, - 0x00, 0x00, 0x7C, 0x66, 0x66, 0x7C, 0x60, 0x60, - 0x00, 0x00, 0x3E, 0x66, 0x66, 0x3E, 0x06, 0x06, - 0x00, 0x00, 0x7C, 0x66, 0x60, 0x60, 0x60, 0x00, - 0x00, 0x00, 0x3E, 0x60, 0x3C, 0x06, 0x7C, 0x00, - 0x18, 0x18, 0x7E, 0x18, 0x18, 0x18, 0x0E, 0x00, - 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3E, 0x00, - 0x00, 0x00, 0x66, 0x66, 0x66, 0x3C, 0x18, 0x00, - 0x00, 0x00, 0x63, 0x6B, 0x7F, 0x3E, 0x36, 0x00, - 0x00, 0x00, 0x66, 0x3C, 0x18, 0x3C, 0x66, 0x00, - 0x00, 0x00, 0x66, 0x66, 0x66, 0x3E, 0x0C, 0x78, - 0x00, 0x00, 0x7E, 0x0C, 0x18, 0x30, 0x7E, 0x00, - 0x00, 0x18, 0x3C, 0x7E, 0x7E, 0x18, 0x3C, 0x00, - 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, - 0x00, 0x7E, 0x78, 0x7C, 0x6E, 0x66, 0x06, 0x00, - 0x08, 0x18, 0x38, 0x78, 0x38, 0x18, 0x08, 0x00, - 0x10, 0x18, 0x1C, 0x1E, 0x1C, 0x18, 0x10, 0x00, - 0xFF, 0xC9, 0x80, 0x80, 0xC1, 0xE3, 0xF7, 0xFF, - 0xFF, 0xFF, 0xC0, 0xDF, 0xD0, 0xD7, 0xD7, 0xD7, - 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, - 0xD7, 0xD7, 0xD0, 0xDF, 0xD0, 0xD7, 0xD7, 0xD7, - 0xD7, 0xD7, 0xD0, 0xDF, 0xC0, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0x00, 0xFF, 0x10, 0xD7, 0xD7, 0xD7, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xD7, 0xD7, 0x10, 0xFF, 0x10, 0xD7, 0xD7, 0xD7, - 0xD7, 0xD7, 0x10, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0x07, 0xF7, 0x17, 0xD7, 0xD7, 0xD7, - 0xD7, 0xD7, 0x17, 0xF7, 0x17, 0xD7, 0xD7, 0xD7, - 0xD7, 0xD7, 0x17, 0xF7, 0x07, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xEF, 0xEF, 0xEF, - 0xEF, 0xEF, 0x00, 0xFF, 0x00, 0xEF, 0xEF, 0xEF, - 0xEF, 0xEF, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xEF, 0xEF, 0xEF, 0x00, 0xEF, 0xEF, 0xEF, 0xEF, - 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, - 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, - 0x18, 0x18, 0x18, 0x1F, 0x1F, 0x00, 0x00, 0x00, - 0x78, 0x60, 0x78, 0x60, 0x7E, 0x18, 0x1E, 0x00, - 0x00, 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x18, 0x00, - 0x00, 0x18, 0x18, 0x18, 0x7E, 0x3C, 0x18, 0x00, - 0x00, 0x18, 0x30, 0x7E, 0x30, 0x18, 0x00, 0x00, - 0x00, 0x18, 0x0C, 0x7E, 0x0C, 0x18, 0x00, 0x00, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xE7, 0xE7, 0xE7, 0xE7, 0xFF, 0xE7, 0xE7, 0xFF, - 0x99, 0x99, 0x99, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x99, 0x00, 0x99, 0x99, 0x00, 0x99, 0xFF, - 0xE7, 0xC1, 0x9F, 0xC3, 0xF9, 0x83, 0xE7, 0xFF, - 0xFF, 0x99, 0x93, 0xE7, 0xCF, 0x99, 0xB9, 0xFF, - 0xE3, 0xC9, 0xE3, 0xC7, 0x90, 0x99, 0xC4, 0xFF, - 0xE7, 0xE7, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xF1, 0xE3, 0xE7, 0xE7, 0xE7, 0xE3, 0xF1, 0xFF, - 0x8F, 0xC7, 0xE7, 0xE7, 0xE7, 0xC7, 0x8F, 0xFF, - 0xFF, 0x99, 0xC3, 0x00, 0xC3, 0x99, 0xFF, 0xFF, - 0xFF, 0xE7, 0xE7, 0x81, 0xE7, 0xE7, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0xE7, 0xCF, - 0xFF, 0xFF, 0xFF, 0x81, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0xE7, 0xFF, - 0xFD, 0xF9, 0xF3, 0xE7, 0xCF, 0x9F, 0xBF, 0xFF, - 0xC3, 0x99, 0x91, 0x81, 0x89, 0x99, 0xC3, 0xFF, - 0xE7, 0xC7, 0xE7, 0xE7, 0xE7, 0xE7, 0x81, 0xFF, - 0xC3, 0x99, 0xF9, 0xF3, 0xE7, 0xCF, 0x81, 0xFF, - 0x81, 0xF3, 0xE7, 0xF3, 0xF9, 0x99, 0xC3, 0xFF, - 0xF3, 0xE3, 0xC3, 0x93, 0x93, 0x81, 0xF3, 0xFF, - 0x81, 0x9F, 0x83, 0xF9, 0xF9, 0x99, 0xC3, 0xFF, - 0xC3, 0x9F, 0x9F, 0x83, 0x99, 0x99, 0xC3, 0xFF, - 0x81, 0xF9, 0xF3, 0xE7, 0xCF, 0xCF, 0xCF, 0xFF, - 0xC3, 0x99, 0x99, 0xC3, 0x99, 0x99, 0xC3, 0xFF, - 0xC3, 0x99, 0x99, 0xC1, 0xF9, 0xF3, 0xC7, 0xFF, - 0xFF, 0xE7, 0xE7, 0xFF, 0xFF, 0xE7, 0xE7, 0xFF, - 0xFF, 0xE7, 0xE7, 0xFF, 0xFF, 0xE7, 0xE7, 0xCF, - 0xF9, 0xF3, 0xE7, 0xCF, 0xE7, 0xF3, 0xF9, 0xFF, - 0xFF, 0xFF, 0x81, 0xFF, 0xFF, 0x81, 0xFF, 0xFF, - 0x9F, 0xCF, 0xE7, 0xF3, 0xE7, 0xCF, 0x9F, 0xFF, - 0xC3, 0x99, 0xFB, 0xF3, 0xE7, 0xFF, 0xE7, 0xFF, - 0xC3, 0x99, 0x99, 0x91, 0x91, 0x9F, 0xC1, 0xFF, - 0xE7, 0xC3, 0x99, 0x99, 0x81, 0x99, 0x99, 0xFF, - 0x83, 0x99, 0x99, 0x83, 0x99, 0x99, 0x83, 0xFF, - 0xC3, 0x99, 0x9F, 0x9F, 0x9F, 0x99, 0xC3, 0xFF, - 0x87, 0x93, 0x99, 0x99, 0x99, 0x93, 0x87, 0xFF, - 0x81, 0x9F, 0x9F, 0x83, 0x9F, 0x9F, 0x81, 0xFF, - 0x81, 0x9F, 0x9F, 0x83, 0x9F, 0x9F, 0x9F, 0xFF, - 0xC1, 0x9F, 0x9F, 0x91, 0x99, 0x99, 0xC1, 0xFF, - 0x99, 0x99, 0x99, 0x81, 0x99, 0x99, 0x99, 0xFF, - 0x81, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0x81, 0xFF, - 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0x99, 0xC3, 0xFF, - 0x99, 0x93, 0x87, 0x87, 0x93, 0x99, 0x99, 0xFF, - 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x81, 0xFF, - 0x9C, 0x88, 0x80, 0x94, 0x9C, 0x9C, 0x9C, 0xFF, - 0x99, 0x89, 0x81, 0x81, 0x91, 0x99, 0x99, 0xFF, - 0xC3, 0x99, 0x99, 0x99, 0x99, 0x99, 0xC3, 0xFF, - 0x83, 0x99, 0x99, 0x99, 0x83, 0x9F, 0x9F, 0xFF, - 0xC3, 0x99, 0x99, 0x99, 0x99, 0x93, 0xC9, 0xFF, - 0x83, 0x99, 0x99, 0x83, 0x93, 0x99, 0x99, 0xFF, - 0xC3, 0x9F, 0x9F, 0xC3, 0xF9, 0xF9, 0xC3, 0xFF, - 0x81, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xFF, - 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x81, 0xFF, - 0x99, 0x99, 0x99, 0x99, 0x99, 0xC3, 0xE7, 0xFF, - 0x9C, 0x9C, 0x9C, 0x94, 0x80, 0x88, 0x9C, 0xFF, - 0x99, 0x99, 0xC3, 0xC3, 0x99, 0x99, 0x99, 0xFF, - 0x99, 0x99, 0x99, 0xC3, 0xE7, 0xE7, 0xE7, 0xFF, - 0x81, 0xF3, 0xE7, 0xCF, 0x9F, 0x9F, 0x81, 0xFF, - 0xE1, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE1, 0xFF, - 0xFF, 0xBF, 0x9F, 0xCF, 0xE7, 0xF3, 0xF9, 0xFF, - 0x87, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0x87, 0xFF, - 0xFF, 0xF7, 0xE3, 0xC9, 0x9C, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, - 0x00, 0x18, 0x3C, 0x7E, 0x7E, 0x3C, 0x18, 0x00, - 0xFF, 0xFF, 0xC3, 0xF9, 0xC1, 0x99, 0xC1, 0xFF, - 0x9F, 0x9F, 0x83, 0x99, 0x99, 0x99, 0x83, 0xFF, - 0xFF, 0xFF, 0xC3, 0x9F, 0x9F, 0x9F, 0xC3, 0xFF, - 0xF9, 0xF9, 0xC1, 0x99, 0x99, 0x99, 0xC1, 0xFF, - 0xFF, 0xFF, 0xC3, 0x99, 0x81, 0x9F, 0xC3, 0xFF, - 0xF1, 0xE7, 0xE7, 0xC1, 0xE7, 0xE7, 0xE7, 0xFF, - 0xFF, 0xFF, 0xC1, 0x99, 0x99, 0xC1, 0xF9, 0x83, - 0x9F, 0x9F, 0x83, 0x99, 0x99, 0x99, 0x99, 0xFF, - 0xE7, 0xFF, 0xC7, 0xE7, 0xE7, 0xE7, 0xC3, 0xFF, - 0xF9, 0xFF, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xC3, - 0x9F, 0x9F, 0x93, 0x87, 0x93, 0x99, 0x99, 0xFF, - 0xC7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xC3, 0xFF, - 0xFF, 0xFF, 0x99, 0x80, 0x80, 0x94, 0x9C, 0xFF, - 0xFF, 0xFF, 0x83, 0x99, 0x99, 0x99, 0x99, 0xFF, - 0xFF, 0xFF, 0xC3, 0x99, 0x99, 0x99, 0xC3, 0xFF, - 0xFF, 0xFF, 0x83, 0x99, 0x99, 0x83, 0x9F, 0x9F, - 0xFF, 0xFF, 0xC1, 0x99, 0x99, 0xC1, 0xF9, 0xF9, - 0xFF, 0xFF, 0x83, 0x99, 0x9F, 0x9F, 0x9F, 0xFF, - 0xFF, 0xFF, 0xC1, 0x9F, 0xC3, 0xF9, 0x83, 0xFF, - 0xE7, 0xE7, 0x81, 0xE7, 0xE7, 0xE7, 0xF1, 0xFF, - 0xFF, 0xFF, 0x99, 0x99, 0x99, 0x99, 0xC1, 0xFF, - 0xFF, 0xFF, 0x99, 0x99, 0x99, 0xC3, 0xE7, 0xFF, - 0xFF, 0xFF, 0x9C, 0x94, 0x80, 0xC1, 0xC9, 0xFF, - 0xFF, 0xFF, 0x99, 0xC3, 0xE7, 0xC3, 0x99, 0xFF, - 0xFF, 0xFF, 0x99, 0x99, 0x99, 0xC1, 0xF3, 0x87, - 0xFF, 0xFF, 0x81, 0xF3, 0xE7, 0xCF, 0x81, 0xFF, - 0x00, 0x18, 0x3C, 0x7E, 0x7E, 0x18, 0x3C, 0x00, - 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, - 0x00, 0x7E, 0x78, 0x7C, 0x6E, 0x66, 0x06, 0x00, - 0x08, 0x18, 0x38, 0x78, 0x38, 0x18, 0x08, 0x00, - 0x10, 0x18, 0x1C, 0x1E, 0x1C, 0x18, 0x10, 0x00, + 0x28, 0x28, 0xE8, 0x08, 0xE8, 0x28, 0x28, 0x28, + 0x28, 0x28, 0xE8, 0x08, 0xF8, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x10, 0x10, 0x10, + 0x10, 0x10, 0xFF, 0x00, 0xFF, 0x10, 0x10, 0x10, + 0x10, 0x10, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x10, 0x10, 0xFF, 0x10, 0x10, 0x10, 0x10, + 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0x18, 0x18, 0x18, 0x1F, 0x1F, 0x00, 0x00, 0x00, + 0x78, 0x60, 0x78, 0x60, 0x7E, 0x18, 0x1E, 0x00, + 0x00, 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x18, 0x00, + 0x00, 0x18, 0x18, 0x18, 0x7E, 0x3C, 0x18, 0x00, + 0x00, 0x18, 0x30, 0x7E, 0x30, 0x18, 0x00, 0x00, + 0x00, 0x18, 0x0C, 0x7E, 0x0C, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, + 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x66, 0xFF, 0x66, 0x66, 0xFF, 0x66, 0x00, + 0x18, 0x3E, 0x60, 0x3C, 0x06, 0x7C, 0x18, 0x00, + 0x00, 0x66, 0x6C, 0x18, 0x30, 0x66, 0x46, 0x00, + 0x1C, 0x36, 0x1C, 0x38, 0x6F, 0x66, 0x3B, 0x00, + 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0E, 0x1C, 0x18, 0x18, 0x18, 0x1C, 0x0E, 0x00, + 0x70, 0x38, 0x18, 0x18, 0x18, 0x38, 0x70, 0x00, + 0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00, + 0x00, 0x18, 0x18, 0x7E, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, + 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, + 0x02, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x40, 0x00, + 0x3C, 0x66, 0x6E, 0x7E, 0x76, 0x66, 0x3C, 0x00, + 0x18, 0x38, 0x18, 0x18, 0x18, 0x18, 0x7E, 0x00, + 0x3C, 0x66, 0x06, 0x0C, 0x18, 0x30, 0x7E, 0x00, + 0x7E, 0x0C, 0x18, 0x0C, 0x06, 0x66, 0x3C, 0x00, + 0x0C, 0x1C, 0x3C, 0x6C, 0x6C, 0x7E, 0x0C, 0x00, + 0x7E, 0x60, 0x7C, 0x06, 0x06, 0x66, 0x3C, 0x00, + 0x3C, 0x60, 0x60, 0x7C, 0x66, 0x66, 0x3C, 0x00, + 0x7E, 0x06, 0x0C, 0x18, 0x30, 0x30, 0x30, 0x00, + 0x3C, 0x66, 0x66, 0x3C, 0x66, 0x66, 0x3C, 0x00, + 0x3C, 0x66, 0x66, 0x3E, 0x06, 0x0C, 0x38, 0x00, + 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00, + 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x30, + 0x06, 0x0C, 0x18, 0x30, 0x18, 0x0C, 0x06, 0x00, + 0x00, 0x00, 0x7E, 0x00, 0x00, 0x7E, 0x00, 0x00, + 0x60, 0x30, 0x18, 0x0C, 0x18, 0x30, 0x60, 0x00, + 0x3C, 0x66, 0x04, 0x0C, 0x18, 0x00, 0x18, 0x00, + 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x3C, 0x66, 0x66, 0x7E, 0x66, 0x66, 0x00, + 0x7C, 0x66, 0x66, 0x7C, 0x66, 0x66, 0x7C, 0x00, + 0x3C, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3C, 0x00, + 0x78, 0x6C, 0x66, 0x66, 0x66, 0x6C, 0x78, 0x00, + 0x7E, 0x60, 0x60, 0x7C, 0x60, 0x60, 0x7E, 0x00, + 0x7E, 0x60, 0x60, 0x7C, 0x60, 0x60, 0x60, 0x00, + 0x3E, 0x60, 0x60, 0x6E, 0x66, 0x66, 0x3E, 0x00, + 0x66, 0x66, 0x66, 0x7E, 0x66, 0x66, 0x66, 0x00, + 0x7E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7E, 0x00, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x3C, 0x00, + 0x66, 0x6C, 0x78, 0x78, 0x6C, 0x66, 0x66, 0x00, + 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7E, 0x00, + 0x63, 0x77, 0x7F, 0x6B, 0x63, 0x63, 0x63, 0x00, + 0x66, 0x76, 0x7E, 0x7E, 0x6E, 0x66, 0x66, 0x00, + 0x3C, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3C, 0x00, + 0x7C, 0x66, 0x66, 0x66, 0x7C, 0x60, 0x60, 0x00, + 0x3C, 0x66, 0x66, 0x66, 0x66, 0x6C, 0x36, 0x00, + 0x7C, 0x66, 0x66, 0x7C, 0x6C, 0x66, 0x66, 0x00, + 0x3C, 0x60, 0x60, 0x3C, 0x06, 0x06, 0x3C, 0x00, + 0x7E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, + 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7E, 0x00, + 0x66, 0x66, 0x66, 0x66, 0x66, 0x3C, 0x18, 0x00, + 0x63, 0x63, 0x63, 0x6B, 0x7F, 0x77, 0x63, 0x00, + 0x66, 0x66, 0x3C, 0x3C, 0x66, 0x66, 0x66, 0x00, + 0x66, 0x66, 0x66, 0x3C, 0x18, 0x18, 0x18, 0x00, + 0x7E, 0x0C, 0x18, 0x30, 0x60, 0x60, 0x7E, 0x00, + 0x1E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1E, 0x00, + 0x00, 0x40, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x00, + 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x00, + 0x00, 0x08, 0x1C, 0x36, 0x63, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, + 0x00, 0x18, 0x3C, 0x7E, 0x7E, 0x3C, 0x18, 0x00, + 0x00, 0x00, 0x3C, 0x06, 0x3E, 0x66, 0x3E, 0x00, + 0x60, 0x60, 0x7C, 0x66, 0x66, 0x66, 0x7C, 0x00, + 0x00, 0x00, 0x3C, 0x60, 0x60, 0x60, 0x3C, 0x00, + 0x06, 0x06, 0x3E, 0x66, 0x66, 0x66, 0x3E, 0x00, + 0x00, 0x00, 0x3C, 0x66, 0x7E, 0x60, 0x3C, 0x00, + 0x0E, 0x18, 0x18, 0x3E, 0x18, 0x18, 0x18, 0x00, + 0x00, 0x00, 0x3E, 0x66, 0x66, 0x3E, 0x06, 0x7C, + 0x60, 0x60, 0x7C, 0x66, 0x66, 0x66, 0x66, 0x00, + 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x3C, 0x00, + 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x3C, + 0x60, 0x60, 0x6C, 0x78, 0x6C, 0x66, 0x66, 0x00, + 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3C, 0x00, + 0x00, 0x00, 0x66, 0x7F, 0x7F, 0x6B, 0x63, 0x00, + 0x00, 0x00, 0x7C, 0x66, 0x66, 0x66, 0x66, 0x00, + 0x00, 0x00, 0x3C, 0x66, 0x66, 0x66, 0x3C, 0x00, + 0x00, 0x00, 0x7C, 0x66, 0x66, 0x7C, 0x60, 0x60, + 0x00, 0x00, 0x3E, 0x66, 0x66, 0x3E, 0x06, 0x06, + 0x00, 0x00, 0x7C, 0x66, 0x60, 0x60, 0x60, 0x00, + 0x00, 0x00, 0x3E, 0x60, 0x3C, 0x06, 0x7C, 0x00, + 0x18, 0x18, 0x7E, 0x18, 0x18, 0x18, 0x0E, 0x00, + 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3E, 0x00, + 0x00, 0x00, 0x66, 0x66, 0x66, 0x3C, 0x18, 0x00, + 0x00, 0x00, 0x63, 0x6B, 0x7F, 0x3E, 0x36, 0x00, + 0x00, 0x00, 0x66, 0x3C, 0x18, 0x3C, 0x66, 0x00, + 0x00, 0x00, 0x66, 0x66, 0x66, 0x3E, 0x0C, 0x78, + 0x00, 0x00, 0x7E, 0x0C, 0x18, 0x30, 0x7E, 0x00, + 0x00, 0x18, 0x3C, 0x7E, 0x7E, 0x18, 0x3C, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x00, 0x7E, 0x78, 0x7C, 0x6E, 0x66, 0x06, 0x00, + 0x08, 0x18, 0x38, 0x78, 0x38, 0x18, 0x08, 0x00, + 0x10, 0x18, 0x1C, 0x1E, 0x1C, 0x18, 0x10, 0x00, + 0xFF, 0xC9, 0x80, 0x80, 0xC1, 0xE3, 0xF7, 0xFF, + 0xFF, 0xFF, 0xC0, 0xDF, 0xD0, 0xD7, 0xD7, 0xD7, + 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, + 0xD7, 0xD7, 0xD0, 0xDF, 0xD0, 0xD7, 0xD7, 0xD7, + 0xD7, 0xD7, 0xD0, 0xDF, 0xC0, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0x00, 0xFF, 0x10, 0xD7, 0xD7, 0xD7, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xD7, 0xD7, 0x10, 0xFF, 0x10, 0xD7, 0xD7, 0xD7, + 0xD7, 0xD7, 0x10, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0x07, 0xF7, 0x17, 0xD7, 0xD7, 0xD7, + 0xD7, 0xD7, 0x17, 0xF7, 0x17, 0xD7, 0xD7, 0xD7, + 0xD7, 0xD7, 0x17, 0xF7, 0x07, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xEF, 0xEF, 0xEF, + 0xEF, 0xEF, 0x00, 0xFF, 0x00, 0xEF, 0xEF, 0xEF, + 0xEF, 0xEF, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xEF, 0xEF, 0xEF, 0x00, 0xEF, 0xEF, 0xEF, 0xEF, + 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, + 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, + 0x18, 0x18, 0x18, 0x1F, 0x1F, 0x00, 0x00, 0x00, + 0x78, 0x60, 0x78, 0x60, 0x7E, 0x18, 0x1E, 0x00, + 0x00, 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x18, 0x00, + 0x00, 0x18, 0x18, 0x18, 0x7E, 0x3C, 0x18, 0x00, + 0x00, 0x18, 0x30, 0x7E, 0x30, 0x18, 0x00, 0x00, + 0x00, 0x18, 0x0C, 0x7E, 0x0C, 0x18, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xE7, 0xE7, 0xE7, 0xE7, 0xFF, 0xE7, 0xE7, 0xFF, + 0x99, 0x99, 0x99, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0x99, 0x00, 0x99, 0x99, 0x00, 0x99, 0xFF, + 0xE7, 0xC1, 0x9F, 0xC3, 0xF9, 0x83, 0xE7, 0xFF, + 0xFF, 0x99, 0x93, 0xE7, 0xCF, 0x99, 0xB9, 0xFF, + 0xE3, 0xC9, 0xE3, 0xC7, 0x90, 0x99, 0xC4, 0xFF, + 0xE7, 0xE7, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xF1, 0xE3, 0xE7, 0xE7, 0xE7, 0xE3, 0xF1, 0xFF, + 0x8F, 0xC7, 0xE7, 0xE7, 0xE7, 0xC7, 0x8F, 0xFF, + 0xFF, 0x99, 0xC3, 0x00, 0xC3, 0x99, 0xFF, 0xFF, + 0xFF, 0xE7, 0xE7, 0x81, 0xE7, 0xE7, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0xE7, 0xCF, + 0xFF, 0xFF, 0xFF, 0x81, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0xE7, 0xFF, + 0xFD, 0xF9, 0xF3, 0xE7, 0xCF, 0x9F, 0xBF, 0xFF, + 0xC3, 0x99, 0x91, 0x81, 0x89, 0x99, 0xC3, 0xFF, + 0xE7, 0xC7, 0xE7, 0xE7, 0xE7, 0xE7, 0x81, 0xFF, + 0xC3, 0x99, 0xF9, 0xF3, 0xE7, 0xCF, 0x81, 0xFF, + 0x81, 0xF3, 0xE7, 0xF3, 0xF9, 0x99, 0xC3, 0xFF, + 0xF3, 0xE3, 0xC3, 0x93, 0x93, 0x81, 0xF3, 0xFF, + 0x81, 0x9F, 0x83, 0xF9, 0xF9, 0x99, 0xC3, 0xFF, + 0xC3, 0x9F, 0x9F, 0x83, 0x99, 0x99, 0xC3, 0xFF, + 0x81, 0xF9, 0xF3, 0xE7, 0xCF, 0xCF, 0xCF, 0xFF, + 0xC3, 0x99, 0x99, 0xC3, 0x99, 0x99, 0xC3, 0xFF, + 0xC3, 0x99, 0x99, 0xC1, 0xF9, 0xF3, 0xC7, 0xFF, + 0xFF, 0xE7, 0xE7, 0xFF, 0xFF, 0xE7, 0xE7, 0xFF, + 0xFF, 0xE7, 0xE7, 0xFF, 0xFF, 0xE7, 0xE7, 0xCF, + 0xF9, 0xF3, 0xE7, 0xCF, 0xE7, 0xF3, 0xF9, 0xFF, + 0xFF, 0xFF, 0x81, 0xFF, 0xFF, 0x81, 0xFF, 0xFF, + 0x9F, 0xCF, 0xE7, 0xF3, 0xE7, 0xCF, 0x9F, 0xFF, + 0xC3, 0x99, 0xFB, 0xF3, 0xE7, 0xFF, 0xE7, 0xFF, + 0xC3, 0x99, 0x99, 0x91, 0x91, 0x9F, 0xC1, 0xFF, + 0xE7, 0xC3, 0x99, 0x99, 0x81, 0x99, 0x99, 0xFF, + 0x83, 0x99, 0x99, 0x83, 0x99, 0x99, 0x83, 0xFF, + 0xC3, 0x99, 0x9F, 0x9F, 0x9F, 0x99, 0xC3, 0xFF, + 0x87, 0x93, 0x99, 0x99, 0x99, 0x93, 0x87, 0xFF, + 0x81, 0x9F, 0x9F, 0x83, 0x9F, 0x9F, 0x81, 0xFF, + 0x81, 0x9F, 0x9F, 0x83, 0x9F, 0x9F, 0x9F, 0xFF, + 0xC1, 0x9F, 0x9F, 0x91, 0x99, 0x99, 0xC1, 0xFF, + 0x99, 0x99, 0x99, 0x81, 0x99, 0x99, 0x99, 0xFF, + 0x81, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0x81, 0xFF, + 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0x99, 0xC3, 0xFF, + 0x99, 0x93, 0x87, 0x87, 0x93, 0x99, 0x99, 0xFF, + 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x81, 0xFF, + 0x9C, 0x88, 0x80, 0x94, 0x9C, 0x9C, 0x9C, 0xFF, + 0x99, 0x89, 0x81, 0x81, 0x91, 0x99, 0x99, 0xFF, + 0xC3, 0x99, 0x99, 0x99, 0x99, 0x99, 0xC3, 0xFF, + 0x83, 0x99, 0x99, 0x99, 0x83, 0x9F, 0x9F, 0xFF, + 0xC3, 0x99, 0x99, 0x99, 0x99, 0x93, 0xC9, 0xFF, + 0x83, 0x99, 0x99, 0x83, 0x93, 0x99, 0x99, 0xFF, + 0xC3, 0x9F, 0x9F, 0xC3, 0xF9, 0xF9, 0xC3, 0xFF, + 0x81, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xFF, + 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x81, 0xFF, + 0x99, 0x99, 0x99, 0x99, 0x99, 0xC3, 0xE7, 0xFF, + 0x9C, 0x9C, 0x9C, 0x94, 0x80, 0x88, 0x9C, 0xFF, + 0x99, 0x99, 0xC3, 0xC3, 0x99, 0x99, 0x99, 0xFF, + 0x99, 0x99, 0x99, 0xC3, 0xE7, 0xE7, 0xE7, 0xFF, + 0x81, 0xF3, 0xE7, 0xCF, 0x9F, 0x9F, 0x81, 0xFF, + 0xE1, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE1, 0xFF, + 0xFF, 0xBF, 0x9F, 0xCF, 0xE7, 0xF3, 0xF9, 0xFF, + 0x87, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0x87, 0xFF, + 0xFF, 0xF7, 0xE3, 0xC9, 0x9C, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, + 0x00, 0x18, 0x3C, 0x7E, 0x7E, 0x3C, 0x18, 0x00, + 0xFF, 0xFF, 0xC3, 0xF9, 0xC1, 0x99, 0xC1, 0xFF, + 0x9F, 0x9F, 0x83, 0x99, 0x99, 0x99, 0x83, 0xFF, + 0xFF, 0xFF, 0xC3, 0x9F, 0x9F, 0x9F, 0xC3, 0xFF, + 0xF9, 0xF9, 0xC1, 0x99, 0x99, 0x99, 0xC1, 0xFF, + 0xFF, 0xFF, 0xC3, 0x99, 0x81, 0x9F, 0xC3, 0xFF, + 0xF1, 0xE7, 0xE7, 0xC1, 0xE7, 0xE7, 0xE7, 0xFF, + 0xFF, 0xFF, 0xC1, 0x99, 0x99, 0xC1, 0xF9, 0x83, + 0x9F, 0x9F, 0x83, 0x99, 0x99, 0x99, 0x99, 0xFF, + 0xE7, 0xFF, 0xC7, 0xE7, 0xE7, 0xE7, 0xC3, 0xFF, + 0xF9, 0xFF, 0xF9, 0xF9, 0xF9, 0xF9, 0xF9, 0xC3, + 0x9F, 0x9F, 0x93, 0x87, 0x93, 0x99, 0x99, 0xFF, + 0xC7, 0xE7, 0xE7, 0xE7, 0xE7, 0xE7, 0xC3, 0xFF, + 0xFF, 0xFF, 0x99, 0x80, 0x80, 0x94, 0x9C, 0xFF, + 0xFF, 0xFF, 0x83, 0x99, 0x99, 0x99, 0x99, 0xFF, + 0xFF, 0xFF, 0xC3, 0x99, 0x99, 0x99, 0xC3, 0xFF, + 0xFF, 0xFF, 0x83, 0x99, 0x99, 0x83, 0x9F, 0x9F, + 0xFF, 0xFF, 0xC1, 0x99, 0x99, 0xC1, 0xF9, 0xF9, + 0xFF, 0xFF, 0x83, 0x99, 0x9F, 0x9F, 0x9F, 0xFF, + 0xFF, 0xFF, 0xC1, 0x9F, 0xC3, 0xF9, 0x83, 0xFF, + 0xE7, 0xE7, 0x81, 0xE7, 0xE7, 0xE7, 0xF1, 0xFF, + 0xFF, 0xFF, 0x99, 0x99, 0x99, 0x99, 0xC1, 0xFF, + 0xFF, 0xFF, 0x99, 0x99, 0x99, 0xC3, 0xE7, 0xFF, + 0xFF, 0xFF, 0x9C, 0x94, 0x80, 0xC1, 0xC9, 0xFF, + 0xFF, 0xFF, 0x99, 0xC3, 0xE7, 0xC3, 0x99, 0xFF, + 0xFF, 0xFF, 0x99, 0x99, 0x99, 0xC1, 0xF3, 0x87, + 0xFF, 0xFF, 0x81, 0xF3, 0xE7, 0xCF, 0x81, 0xFF, + 0x00, 0x18, 0x3C, 0x7E, 0x7E, 0x18, 0x3C, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x00, 0x7E, 0x78, 0x7C, 0x6E, 0x66, 0x06, 0x00, + 0x08, 0x18, 0x38, 0x78, 0x38, 0x18, 0x08, 0x00, + 0x10, 0x18, 0x1C, 0x1E, 0x1C, 0x18, 0x10, 0x00, }; static const uint8 ibm_fontdata[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x7E, 0x81, 0xA5, 0x81, 0xBD, 0x99, 0x81, 0x7E, - 0x7E, 0xFF, 0xDB, 0xFF, 0xC3, 0xE7, 0xFF, 0x7E, - 0x6C, 0xFE, 0xFE, 0xFE, 0x7C, 0x38, 0x10, 0x00, - 0x10, 0x38, 0x7C, 0xFE, 0x7C, 0x38, 0x10, 0x00, - 0x38, 0x7C, 0x38, 0xFE, 0xFE, 0x7C, 0x38, 0x7C, - 0x10, 0x10, 0x38, 0x7C, 0xFE, 0x7C, 0x38, 0x7C, - 0x00, 0x00, 0x18, 0x3C, 0x3C, 0x18, 0x00, 0x00, - 0xFF, 0xFF, 0xE7, 0xC3, 0xC3, 0xE7, 0xFF, 0xFF, - 0x00, 0x3C, 0x66, 0x42, 0x42, 0x66, 0x3C, 0x00, - 0xFF, 0xC3, 0x99, 0xBD, 0xBD, 0x99, 0xC3, 0xFF, - 0x0F, 0x07, 0x0F, 0x7D, 0xCC, 0xCC, 0xCC, 0x78, - 0x3C, 0x66, 0x66, 0x66, 0x3C, 0x18, 0x7E, 0x18, - 0x3F, 0x33, 0x3F, 0x30, 0x30, 0x70, 0xF0, 0xE0, - 0x7F, 0x63, 0x7F, 0x63, 0x63, 0x67, 0xE6, 0xC0, - 0x99, 0x5A, 0x3C, 0xE7, 0xE7, 0x3C, 0x5A, 0x99, - 0x80, 0xE0, 0xF8, 0xFE, 0xF8, 0xE0, 0x80, 0x00, - 0x02, 0x0E, 0x3E, 0xFE, 0x3E, 0x0E, 0x02, 0x00, - 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x7E, 0x3C, 0x18, - 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x66, 0x00, - 0x7F, 0xDB, 0xDB, 0x7B, 0x1B, 0x1B, 0x1B, 0x00, - 0x3E, 0x63, 0x38, 0x6C, 0x6C, 0x38, 0xCC, 0x78, - 0x00, 0x00, 0x00, 0x00, 0x7E, 0x7E, 0x7E, 0x00, - 0x18, 0x3C, 0x7E, 0x18, 0x7E, 0x3C, 0x18, 0xFF, - 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x18, 0x18, 0x00, - 0x18, 0x18, 0x18, 0x18, 0x7E, 0x3C, 0x18, 0x00, - 0x00, 0x18, 0x0C, 0xFE, 0x0C, 0x18, 0x00, 0x00, - 0x00, 0x30, 0x60, 0xFE, 0x60, 0x30, 0x00, 0x00, - 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xFE, 0x00, 0x00, - 0x00, 0x24, 0x66, 0xFF, 0x66, 0x24, 0x00, 0x00, - 0x00, 0x18, 0x3C, 0x7E, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0xFF, 0xFF, 0x7E, 0x3C, 0x18, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x30, 0x78, 0x78, 0x30, 0x30, 0x00, 0x30, 0x00, - 0x6C, 0x6C, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x6C, 0x6C, 0xFE, 0x6C, 0xFE, 0x6C, 0x6C, 0x00, - 0x30, 0x7C, 0xC0, 0x78, 0x0C, 0xF8, 0x30, 0x00, - 0x00, 0xC6, 0xCC, 0x18, 0x30, 0x66, 0xC6, 0x00, - 0x38, 0x6C, 0x38, 0x76, 0xDC, 0xCC, 0x76, 0x00, - 0x60, 0x60, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x18, 0x30, 0x60, 0x60, 0x60, 0x30, 0x18, 0x00, - 0x60, 0x30, 0x18, 0x18, 0x18, 0x30, 0x60, 0x00, - 0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00, - 0x00, 0x30, 0x30, 0xFC, 0x30, 0x30, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x60, - 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, - 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC0, 0x80, 0x00, - 0x7C, 0xC6, 0xCE, 0xDE, 0xF6, 0xE6, 0x7C, 0x00, - 0x30, 0x70, 0x30, 0x30, 0x30, 0x30, 0xFC, 0x00, - 0x78, 0xCC, 0x0C, 0x38, 0x60, 0xCC, 0xFC, 0x00, - 0x78, 0xCC, 0x0C, 0x38, 0x0C, 0xCC, 0x78, 0x00, - 0x1C, 0x3C, 0x6C, 0xCC, 0xFE, 0x0C, 0x1E, 0x00, - 0xFC, 0xC0, 0xF8, 0x0C, 0x0C, 0xCC, 0x78, 0x00, - 0x38, 0x60, 0xC0, 0xF8, 0xCC, 0xCC, 0x78, 0x00, - 0xFC, 0xCC, 0x0C, 0x18, 0x30, 0x30, 0x30, 0x00, - 0x78, 0xCC, 0xCC, 0x78, 0xCC, 0xCC, 0x78, 0x00, - 0x78, 0xCC, 0xCC, 0x7C, 0x0C, 0x18, 0x70, 0x00, - 0x00, 0x30, 0x30, 0x00, 0x00, 0x30, 0x30, 0x00, - 0x00, 0x30, 0x30, 0x00, 0x00, 0x30, 0x30, 0x60, - 0x18, 0x30, 0x60, 0xC0, 0x60, 0x30, 0x18, 0x00, - 0x00, 0x00, 0xFC, 0x00, 0x00, 0xFC, 0x00, 0x00, - 0x60, 0x30, 0x18, 0x0C, 0x18, 0x30, 0x60, 0x00, - 0x78, 0xCC, 0x0C, 0x18, 0x30, 0x00, 0x30, 0x00, - 0x7C, 0xC6, 0xDE, 0xDE, 0xDE, 0xC0, 0x78, 0x00, - 0x30, 0x78, 0xCC, 0xCC, 0xFC, 0xCC, 0xCC, 0x00, - 0xFC, 0x66, 0x66, 0x7C, 0x66, 0x66, 0xFC, 0x00, - 0x3C, 0x66, 0xC0, 0xC0, 0xC0, 0x66, 0x3C, 0x00, - 0xF8, 0x6C, 0x66, 0x66, 0x66, 0x6C, 0xF8, 0x00, - 0xFE, 0x62, 0x68, 0x78, 0x68, 0x62, 0xFE, 0x00, - 0xFE, 0x62, 0x68, 0x78, 0x68, 0x60, 0xF0, 0x00, - 0x3C, 0x66, 0xC0, 0xC0, 0xCE, 0x66, 0x3E, 0x00, - 0xCC, 0xCC, 0xCC, 0xFC, 0xCC, 0xCC, 0xCC, 0x00, - 0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, - 0x1E, 0x0C, 0x0C, 0x0C, 0xCC, 0xCC, 0x78, 0x00, - 0xE6, 0x66, 0x6C, 0x78, 0x6C, 0x66, 0xE6, 0x00, - 0xF0, 0x60, 0x60, 0x60, 0x62, 0x66, 0xFE, 0x00, - 0xC6, 0xEE, 0xFE, 0xFE, 0xD6, 0xC6, 0xC6, 0x00, - 0xC6, 0xE6, 0xF6, 0xDE, 0xCE, 0xC6, 0xC6, 0x00, - 0x38, 0x6C, 0xC6, 0xC6, 0xC6, 0x6C, 0x38, 0x00, - 0xFC, 0x66, 0x66, 0x7C, 0x60, 0x60, 0xF0, 0x00, - 0x78, 0xCC, 0xCC, 0xCC, 0xDC, 0x78, 0x1C, 0x00, - 0xFC, 0x66, 0x66, 0x7C, 0x6C, 0x66, 0xE6, 0x00, - 0x78, 0xCC, 0xE0, 0x70, 0x1C, 0xCC, 0x78, 0x00, - 0xFC, 0xB4, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, - 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xFC, 0x00, - 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x00, - 0xC6, 0xC6, 0xC6, 0xD6, 0xFE, 0xEE, 0xC6, 0x00, - 0xC6, 0xC6, 0x6C, 0x38, 0x38, 0x6C, 0xC6, 0x00, - 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x30, 0x78, 0x00, - 0xFE, 0xC6, 0x8C, 0x18, 0x32, 0x66, 0xFE, 0x00, - 0x78, 0x60, 0x60, 0x60, 0x60, 0x60, 0x78, 0x00, - 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x02, 0x00, - 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x00, - 0x10, 0x38, 0x6C, 0xC6, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, - 0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00, - 0xE0, 0x60, 0x60, 0x7C, 0x66, 0x66, 0xDC, 0x00, - 0x00, 0x00, 0x78, 0xCC, 0xC0, 0xCC, 0x78, 0x00, - 0x1C, 0x0C, 0x0C, 0x7C, 0xCC, 0xCC, 0x76, 0x00, - 0x00, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, - 0x38, 0x6C, 0x60, 0xF0, 0x60, 0x60, 0xF0, 0x00, - 0x00, 0x00, 0x76, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8, - 0xE0, 0x60, 0x6C, 0x76, 0x66, 0x66, 0xE6, 0x00, - 0x30, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, - 0x0C, 0x00, 0x0C, 0x0C, 0x0C, 0xCC, 0xCC, 0x78, - 0xE0, 0x60, 0x66, 0x6C, 0x78, 0x6C, 0xE6, 0x00, - 0x70, 0x30, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, - 0x00, 0x00, 0xCC, 0xFE, 0xFE, 0xD6, 0xC6, 0x00, - 0x00, 0x00, 0xF8, 0xCC, 0xCC, 0xCC, 0xCC, 0x00, - 0x00, 0x00, 0x78, 0xCC, 0xCC, 0xCC, 0x78, 0x00, - 0x00, 0x00, 0xDC, 0x66, 0x66, 0x7C, 0x60, 0xF0, - 0x00, 0x00, 0x76, 0xCC, 0xCC, 0x7C, 0x0C, 0x1E, - 0x00, 0x00, 0xDC, 0x76, 0x66, 0x60, 0xF0, 0x00, - 0x00, 0x00, 0x7C, 0xC0, 0x78, 0x0C, 0xF8, 0x00, - 0x10, 0x30, 0x7C, 0x30, 0x30, 0x34, 0x18, 0x00, - 0x00, 0x00, 0xCC, 0xCC, 0xCC, 0xCC, 0x76, 0x00, - 0x00, 0x00, 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x00, - 0x00, 0x00, 0xC6, 0xD6, 0xFE, 0xFE, 0x6C, 0x00, - 0x00, 0x00, 0xC6, 0x6C, 0x38, 0x6C, 0xC6, 0x00, - 0x00, 0x00, 0xCC, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8, - 0x00, 0x00, 0xFC, 0x98, 0x30, 0x64, 0xFC, 0x00, - 0x1C, 0x30, 0x30, 0xE0, 0x30, 0x30, 0x1C, 0x00, - 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00, - 0xE0, 0x30, 0x30, 0x1C, 0x30, 0x30, 0xE0, 0x00, - 0x76, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x10, 0x38, 0x6C, 0xC6, 0xC6, 0xFE, 0x00, - 0x78, 0xCC, 0xC0, 0xCC, 0x78, 0x18, 0x0C, 0x78, - 0x00, 0xCC, 0x00, 0xCC, 0xCC, 0xCC, 0x7E, 0x00, - 0x1C, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, - 0x7E, 0xC3, 0x3C, 0x06, 0x3E, 0x66, 0x3F, 0x00, - 0xCC, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x7E, 0x00, - 0xE0, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x7E, 0x00, - 0x30, 0x30, 0x78, 0x0C, 0x7C, 0xCC, 0x7E, 0x00, - 0x00, 0x00, 0x78, 0xC0, 0xC0, 0x78, 0x0C, 0x38, - 0x7E, 0xC3, 0x3C, 0x66, 0x7E, 0x60, 0x3C, 0x00, - 0xCC, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, - 0xE0, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, - 0xCC, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, - 0x7C, 0xC6, 0x38, 0x18, 0x18, 0x18, 0x3C, 0x00, - 0xE0, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, - 0xC6, 0x38, 0x6C, 0xC6, 0xFE, 0xC6, 0xC6, 0x00, - 0x30, 0x30, 0x00, 0x78, 0xCC, 0xFC, 0xCC, 0x00, - 0x1C, 0x00, 0xFC, 0x60, 0x78, 0x60, 0xFC, 0x00, - 0x00, 0x00, 0x7F, 0x0C, 0x7F, 0xCC, 0x7F, 0x00, - 0x3E, 0x6C, 0xCC, 0xFE, 0xCC, 0xCC, 0xCE, 0x00, - 0x78, 0xCC, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, - 0x00, 0xCC, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, - 0x00, 0xE0, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, - 0x78, 0xCC, 0x00, 0xCC, 0xCC, 0xCC, 0x7E, 0x00, - 0x00, 0xE0, 0x00, 0xCC, 0xCC, 0xCC, 0x7E, 0x00, - 0x00, 0xCC, 0x00, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8, - 0xC3, 0x18, 0x3C, 0x66, 0x66, 0x3C, 0x18, 0x00, - 0xCC, 0x00, 0xCC, 0xCC, 0xCC, 0xCC, 0x78, 0x00, - 0x18, 0x18, 0x7E, 0xC0, 0xC0, 0x7E, 0x18, 0x18, - 0x38, 0x6C, 0x64, 0xF0, 0x60, 0xE6, 0xFC, 0x00, - 0xCC, 0xCC, 0x78, 0xFC, 0x30, 0xFC, 0x30, 0x30, - 0xF8, 0xCC, 0xCC, 0xFA, 0xC6, 0xCF, 0xC6, 0xC7, - 0x0E, 0x1B, 0x18, 0x3C, 0x18, 0x18, 0xD8, 0x70, - 0x1C, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x7E, 0x00, - 0x38, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, - 0x00, 0x1C, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, - 0x00, 0x1C, 0x00, 0xCC, 0xCC, 0xCC, 0x7E, 0x00, - 0x00, 0xF8, 0x00, 0xF8, 0xCC, 0xCC, 0xCC, 0x00, - 0xFC, 0x00, 0xCC, 0xEC, 0xFC, 0xDC, 0xCC, 0x00, - 0x3C, 0x6C, 0x6C, 0x3E, 0x00, 0x7E, 0x00, 0x00, - 0x38, 0x6C, 0x6C, 0x38, 0x00, 0x7C, 0x00, 0x00, - 0x30, 0x00, 0x30, 0x60, 0xC0, 0xCC, 0x78, 0x00, - 0x00, 0x00, 0x00, 0xFC, 0xC0, 0xC0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xFC, 0x0C, 0x0C, 0x00, 0x00, - 0xC3, 0xC6, 0xCC, 0xDE, 0x33, 0x66, 0xCC, 0x0F, - 0xC3, 0xC6, 0xCC, 0xDB, 0x37, 0x6F, 0xCF, 0x03, - 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, - 0x00, 0x33, 0x66, 0xCC, 0x66, 0x33, 0x00, 0x00, - 0x00, 0xCC, 0x66, 0x33, 0x66, 0xCC, 0x00, 0x00, - 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, - 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, - 0xDB, 0x77, 0xDB, 0xEE, 0xDB, 0x77, 0xDB, 0xEE, - 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, - 0x18, 0x18, 0x18, 0x18, 0xF8, 0x18, 0x18, 0x18, - 0x18, 0x18, 0xF8, 0x18, 0xF8, 0x18, 0x18, 0x18, - 0x36, 0x36, 0x36, 0x36, 0xF6, 0x36, 0x36, 0x36, - 0x00, 0x00, 0x00, 0x00, 0xFE, 0x36, 0x36, 0x36, - 0x00, 0x00, 0xF8, 0x18, 0xF8, 0x18, 0x18, 0x18, - 0x36, 0x36, 0xF6, 0x06, 0xF6, 0x36, 0x36, 0x36, - 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, - 0x00, 0x00, 0xFE, 0x06, 0xF6, 0x36, 0x36, 0x36, - 0x36, 0x36, 0xF6, 0x06, 0xFE, 0x00, 0x00, 0x00, - 0x36, 0x36, 0x36, 0x36, 0xFE, 0x00, 0x00, 0x00, - 0x18, 0x18, 0xF8, 0x18, 0xF8, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xF8, 0x18, 0x18, 0x18, - 0x18, 0x18, 0x18, 0x18, 0x1F, 0x00, 0x00, 0x00, - 0x18, 0x18, 0x18, 0x18, 0xFF, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xFF, 0x18, 0x18, 0x18, - 0x18, 0x18, 0x18, 0x18, 0x1F, 0x18, 0x18, 0x18, - 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, - 0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, - 0x18, 0x18, 0x1F, 0x18, 0x1F, 0x18, 0x18, 0x18, - 0x36, 0x36, 0x36, 0x36, 0x37, 0x36, 0x36, 0x36, - 0x36, 0x36, 0x37, 0x30, 0x3F, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x3F, 0x30, 0x37, 0x36, 0x36, 0x36, - 0x36, 0x36, 0xF7, 0x00, 0xFF, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0x00, 0xF7, 0x36, 0x36, 0x36, - 0x36, 0x36, 0x37, 0x30, 0x37, 0x36, 0x36, 0x36, - 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, - 0x36, 0x36, 0xF7, 0x00, 0xF7, 0x36, 0x36, 0x36, - 0x18, 0x18, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, - 0x36, 0x36, 0x36, 0x36, 0xFF, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x18, 0x18, 0x18, - 0x00, 0x00, 0x00, 0x00, 0xFF, 0x36, 0x36, 0x36, - 0x36, 0x36, 0x36, 0x36, 0x3F, 0x00, 0x00, 0x00, - 0x18, 0x18, 0x1F, 0x18, 0x1F, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x1F, 0x18, 0x1F, 0x18, 0x18, 0x18, - 0x00, 0x00, 0x00, 0x00, 0x3F, 0x36, 0x36, 0x36, - 0x36, 0x36, 0x36, 0x36, 0xFF, 0x36, 0x36, 0x36, - 0x18, 0x18, 0xFF, 0x18, 0xFF, 0x18, 0x18, 0x18, - 0x18, 0x18, 0x18, 0x18, 0xF8, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x1F, 0x18, 0x18, 0x18, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, - 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, - 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, - 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x76, 0xDC, 0xC8, 0xDC, 0x76, 0x00, - 0x00, 0x78, 0xCC, 0xF8, 0xCC, 0xF8, 0xC0, 0xC0, - 0x00, 0xFC, 0xCC, 0xC0, 0xC0, 0xC0, 0xC0, 0x00, - 0x00, 0xFE, 0x6C, 0x6C, 0x6C, 0x6C, 0x6C, 0x00, - 0xFC, 0xCC, 0x60, 0x30, 0x60, 0xCC, 0xFC, 0x00, - 0x00, 0x00, 0x7E, 0xD8, 0xD8, 0xD8, 0x70, 0x00, - 0x00, 0x66, 0x66, 0x66, 0x66, 0x7C, 0x60, 0xC0, - 0x00, 0x76, 0xDC, 0x18, 0x18, 0x18, 0x18, 0x00, - 0xFC, 0x30, 0x78, 0xCC, 0xCC, 0x78, 0x30, 0xFC, - 0x38, 0x6C, 0xC6, 0xFE, 0xC6, 0x6C, 0x38, 0x00, - 0x38, 0x6C, 0xC6, 0xC6, 0x6C, 0x6C, 0xEE, 0x00, - 0x1C, 0x30, 0x18, 0x7C, 0xCC, 0xCC, 0x78, 0x00, - 0x00, 0x00, 0x7E, 0xDB, 0xDB, 0x7E, 0x00, 0x00, - 0x06, 0x0C, 0x7E, 0xDB, 0xDB, 0x7E, 0x60, 0xC0, - 0x38, 0x60, 0xC0, 0xF8, 0xC0, 0x60, 0x38, 0x00, - 0x78, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x00, - 0x00, 0xFC, 0x00, 0xFC, 0x00, 0xFC, 0x00, 0x00, - 0x30, 0x30, 0xFC, 0x30, 0x30, 0x00, 0xFC, 0x00, - 0x60, 0x30, 0x18, 0x30, 0x60, 0x00, 0xFC, 0x00, - 0x18, 0x30, 0x60, 0x30, 0x18, 0x00, 0xFC, 0x00, - 0x0E, 0x1B, 0x1B, 0x18, 0x18, 0x18, 0x18, 0x18, - 0x18, 0x18, 0x18, 0x18, 0x18, 0xD8, 0xD8, 0x70, - 0x30, 0x30, 0x00, 0xFC, 0x00, 0x30, 0x30, 0x00, - 0x00, 0x76, 0xDC, 0x00, 0x76, 0xDC, 0x00, 0x00, - 0x38, 0x6C, 0x6C, 0x38, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, - 0x0F, 0x0C, 0x0C, 0x0C, 0xEC, 0x6C, 0x3C, 0x1C, - 0x78, 0x6C, 0x6C, 0x6C, 0x6C, 0x00, 0x00, 0x00, - 0x70, 0x18, 0x30, 0x60, 0x78, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x7E, 0x81, 0xA5, 0x81, 0xBD, 0x99, 0x81, 0x7E, + 0x7E, 0xFF, 0xDB, 0xFF, 0xC3, 0xE7, 0xFF, 0x7E, + 0x6C, 0xFE, 0xFE, 0xFE, 0x7C, 0x38, 0x10, 0x00, + 0x10, 0x38, 0x7C, 0xFE, 0x7C, 0x38, 0x10, 0x00, + 0x38, 0x7C, 0x38, 0xFE, 0xFE, 0x7C, 0x38, 0x7C, + 0x10, 0x10, 0x38, 0x7C, 0xFE, 0x7C, 0x38, 0x7C, + 0x00, 0x00, 0x18, 0x3C, 0x3C, 0x18, 0x00, 0x00, + 0xFF, 0xFF, 0xE7, 0xC3, 0xC3, 0xE7, 0xFF, 0xFF, + 0x00, 0x3C, 0x66, 0x42, 0x42, 0x66, 0x3C, 0x00, + 0xFF, 0xC3, 0x99, 0xBD, 0xBD, 0x99, 0xC3, 0xFF, + 0x0F, 0x07, 0x0F, 0x7D, 0xCC, 0xCC, 0xCC, 0x78, + 0x3C, 0x66, 0x66, 0x66, 0x3C, 0x18, 0x7E, 0x18, + 0x3F, 0x33, 0x3F, 0x30, 0x30, 0x70, 0xF0, 0xE0, + 0x7F, 0x63, 0x7F, 0x63, 0x63, 0x67, 0xE6, 0xC0, + 0x99, 0x5A, 0x3C, 0xE7, 0xE7, 0x3C, 0x5A, 0x99, + 0x80, 0xE0, 0xF8, 0xFE, 0xF8, 0xE0, 0x80, 0x00, + 0x02, 0x0E, 0x3E, 0xFE, 0x3E, 0x0E, 0x02, 0x00, + 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x7E, 0x3C, 0x18, + 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x66, 0x00, + 0x7F, 0xDB, 0xDB, 0x7B, 0x1B, 0x1B, 0x1B, 0x00, + 0x3E, 0x63, 0x38, 0x6C, 0x6C, 0x38, 0xCC, 0x78, + 0x00, 0x00, 0x00, 0x00, 0x7E, 0x7E, 0x7E, 0x00, + 0x18, 0x3C, 0x7E, 0x18, 0x7E, 0x3C, 0x18, 0xFF, + 0x18, 0x3C, 0x7E, 0x18, 0x18, 0x18, 0x18, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x7E, 0x3C, 0x18, 0x00, + 0x00, 0x18, 0x0C, 0xFE, 0x0C, 0x18, 0x00, 0x00, + 0x00, 0x30, 0x60, 0xFE, 0x60, 0x30, 0x00, 0x00, + 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xFE, 0x00, 0x00, + 0x00, 0x24, 0x66, 0xFF, 0x66, 0x24, 0x00, 0x00, + 0x00, 0x18, 0x3C, 0x7E, 0xFF, 0xFF, 0x00, 0x00, + 0x00, 0xFF, 0xFF, 0x7E, 0x3C, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x30, 0x78, 0x78, 0x30, 0x30, 0x00, 0x30, 0x00, + 0x6C, 0x6C, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6C, 0x6C, 0xFE, 0x6C, 0xFE, 0x6C, 0x6C, 0x00, + 0x30, 0x7C, 0xC0, 0x78, 0x0C, 0xF8, 0x30, 0x00, + 0x00, 0xC6, 0xCC, 0x18, 0x30, 0x66, 0xC6, 0x00, + 0x38, 0x6C, 0x38, 0x76, 0xDC, 0xCC, 0x76, 0x00, + 0x60, 0x60, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x30, 0x60, 0x60, 0x60, 0x30, 0x18, 0x00, + 0x60, 0x30, 0x18, 0x18, 0x18, 0x30, 0x60, 0x00, + 0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00, + 0x00, 0x30, 0x30, 0xFC, 0x30, 0x30, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x60, + 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, + 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC0, 0x80, 0x00, + 0x7C, 0xC6, 0xCE, 0xDE, 0xF6, 0xE6, 0x7C, 0x00, + 0x30, 0x70, 0x30, 0x30, 0x30, 0x30, 0xFC, 0x00, + 0x78, 0xCC, 0x0C, 0x38, 0x60, 0xCC, 0xFC, 0x00, + 0x78, 0xCC, 0x0C, 0x38, 0x0C, 0xCC, 0x78, 0x00, + 0x1C, 0x3C, 0x6C, 0xCC, 0xFE, 0x0C, 0x1E, 0x00, + 0xFC, 0xC0, 0xF8, 0x0C, 0x0C, 0xCC, 0x78, 0x00, + 0x38, 0x60, 0xC0, 0xF8, 0xCC, 0xCC, 0x78, 0x00, + 0xFC, 0xCC, 0x0C, 0x18, 0x30, 0x30, 0x30, 0x00, + 0x78, 0xCC, 0xCC, 0x78, 0xCC, 0xCC, 0x78, 0x00, + 0x78, 0xCC, 0xCC, 0x7C, 0x0C, 0x18, 0x70, 0x00, + 0x00, 0x30, 0x30, 0x00, 0x00, 0x30, 0x30, 0x00, + 0x00, 0x30, 0x30, 0x00, 0x00, 0x30, 0x30, 0x60, + 0x18, 0x30, 0x60, 0xC0, 0x60, 0x30, 0x18, 0x00, + 0x00, 0x00, 0xFC, 0x00, 0x00, 0xFC, 0x00, 0x00, + 0x60, 0x30, 0x18, 0x0C, 0x18, 0x30, 0x60, 0x00, + 0x78, 0xCC, 0x0C, 0x18, 0x30, 0x00, 0x30, 0x00, + 0x7C, 0xC6, 0xDE, 0xDE, 0xDE, 0xC0, 0x78, 0x00, + 0x30, 0x78, 0xCC, 0xCC, 0xFC, 0xCC, 0xCC, 0x00, + 0xFC, 0x66, 0x66, 0x7C, 0x66, 0x66, 0xFC, 0x00, + 0x3C, 0x66, 0xC0, 0xC0, 0xC0, 0x66, 0x3C, 0x00, + 0xF8, 0x6C, 0x66, 0x66, 0x66, 0x6C, 0xF8, 0x00, + 0xFE, 0x62, 0x68, 0x78, 0x68, 0x62, 0xFE, 0x00, + 0xFE, 0x62, 0x68, 0x78, 0x68, 0x60, 0xF0, 0x00, + 0x3C, 0x66, 0xC0, 0xC0, 0xCE, 0x66, 0x3E, 0x00, + 0xCC, 0xCC, 0xCC, 0xFC, 0xCC, 0xCC, 0xCC, 0x00, + 0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, + 0x1E, 0x0C, 0x0C, 0x0C, 0xCC, 0xCC, 0x78, 0x00, + 0xE6, 0x66, 0x6C, 0x78, 0x6C, 0x66, 0xE6, 0x00, + 0xF0, 0x60, 0x60, 0x60, 0x62, 0x66, 0xFE, 0x00, + 0xC6, 0xEE, 0xFE, 0xFE, 0xD6, 0xC6, 0xC6, 0x00, + 0xC6, 0xE6, 0xF6, 0xDE, 0xCE, 0xC6, 0xC6, 0x00, + 0x38, 0x6C, 0xC6, 0xC6, 0xC6, 0x6C, 0x38, 0x00, + 0xFC, 0x66, 0x66, 0x7C, 0x60, 0x60, 0xF0, 0x00, + 0x78, 0xCC, 0xCC, 0xCC, 0xDC, 0x78, 0x1C, 0x00, + 0xFC, 0x66, 0x66, 0x7C, 0x6C, 0x66, 0xE6, 0x00, + 0x78, 0xCC, 0xE0, 0x70, 0x1C, 0xCC, 0x78, 0x00, + 0xFC, 0xB4, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, + 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xFC, 0x00, + 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x00, + 0xC6, 0xC6, 0xC6, 0xD6, 0xFE, 0xEE, 0xC6, 0x00, + 0xC6, 0xC6, 0x6C, 0x38, 0x38, 0x6C, 0xC6, 0x00, + 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x30, 0x78, 0x00, + 0xFE, 0xC6, 0x8C, 0x18, 0x32, 0x66, 0xFE, 0x00, + 0x78, 0x60, 0x60, 0x60, 0x60, 0x60, 0x78, 0x00, + 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x02, 0x00, + 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x00, + 0x10, 0x38, 0x6C, 0xC6, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, + 0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x76, 0x00, + 0xE0, 0x60, 0x60, 0x7C, 0x66, 0x66, 0xDC, 0x00, + 0x00, 0x00, 0x78, 0xCC, 0xC0, 0xCC, 0x78, 0x00, + 0x1C, 0x0C, 0x0C, 0x7C, 0xCC, 0xCC, 0x76, 0x00, + 0x00, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, + 0x38, 0x6C, 0x60, 0xF0, 0x60, 0x60, 0xF0, 0x00, + 0x00, 0x00, 0x76, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8, + 0xE0, 0x60, 0x6C, 0x76, 0x66, 0x66, 0xE6, 0x00, + 0x30, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, + 0x0C, 0x00, 0x0C, 0x0C, 0x0C, 0xCC, 0xCC, 0x78, + 0xE0, 0x60, 0x66, 0x6C, 0x78, 0x6C, 0xE6, 0x00, + 0x70, 0x30, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, + 0x00, 0x00, 0xCC, 0xFE, 0xFE, 0xD6, 0xC6, 0x00, + 0x00, 0x00, 0xF8, 0xCC, 0xCC, 0xCC, 0xCC, 0x00, + 0x00, 0x00, 0x78, 0xCC, 0xCC, 0xCC, 0x78, 0x00, + 0x00, 0x00, 0xDC, 0x66, 0x66, 0x7C, 0x60, 0xF0, + 0x00, 0x00, 0x76, 0xCC, 0xCC, 0x7C, 0x0C, 0x1E, + 0x00, 0x00, 0xDC, 0x76, 0x66, 0x60, 0xF0, 0x00, + 0x00, 0x00, 0x7C, 0xC0, 0x78, 0x0C, 0xF8, 0x00, + 0x10, 0x30, 0x7C, 0x30, 0x30, 0x34, 0x18, 0x00, + 0x00, 0x00, 0xCC, 0xCC, 0xCC, 0xCC, 0x76, 0x00, + 0x00, 0x00, 0xCC, 0xCC, 0xCC, 0x78, 0x30, 0x00, + 0x00, 0x00, 0xC6, 0xD6, 0xFE, 0xFE, 0x6C, 0x00, + 0x00, 0x00, 0xC6, 0x6C, 0x38, 0x6C, 0xC6, 0x00, + 0x00, 0x00, 0xCC, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8, + 0x00, 0x00, 0xFC, 0x98, 0x30, 0x64, 0xFC, 0x00, + 0x1C, 0x30, 0x30, 0xE0, 0x30, 0x30, 0x1C, 0x00, + 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00, + 0xE0, 0x30, 0x30, 0x1C, 0x30, 0x30, 0xE0, 0x00, + 0x76, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x10, 0x38, 0x6C, 0xC6, 0xC6, 0xFE, 0x00, + 0x78, 0xCC, 0xC0, 0xCC, 0x78, 0x18, 0x0C, 0x78, + 0x00, 0xCC, 0x00, 0xCC, 0xCC, 0xCC, 0x7E, 0x00, + 0x1C, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, + 0x7E, 0xC3, 0x3C, 0x06, 0x3E, 0x66, 0x3F, 0x00, + 0xCC, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x7E, 0x00, + 0xE0, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x7E, 0x00, + 0x30, 0x30, 0x78, 0x0C, 0x7C, 0xCC, 0x7E, 0x00, + 0x00, 0x00, 0x78, 0xC0, 0xC0, 0x78, 0x0C, 0x38, + 0x7E, 0xC3, 0x3C, 0x66, 0x7E, 0x60, 0x3C, 0x00, + 0xCC, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, + 0xE0, 0x00, 0x78, 0xCC, 0xFC, 0xC0, 0x78, 0x00, + 0xCC, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, + 0x7C, 0xC6, 0x38, 0x18, 0x18, 0x18, 0x3C, 0x00, + 0xE0, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, + 0xC6, 0x38, 0x6C, 0xC6, 0xFE, 0xC6, 0xC6, 0x00, + 0x30, 0x30, 0x00, 0x78, 0xCC, 0xFC, 0xCC, 0x00, + 0x1C, 0x00, 0xFC, 0x60, 0x78, 0x60, 0xFC, 0x00, + 0x00, 0x00, 0x7F, 0x0C, 0x7F, 0xCC, 0x7F, 0x00, + 0x3E, 0x6C, 0xCC, 0xFE, 0xCC, 0xCC, 0xCE, 0x00, + 0x78, 0xCC, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, + 0x00, 0xCC, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, + 0x00, 0xE0, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, + 0x78, 0xCC, 0x00, 0xCC, 0xCC, 0xCC, 0x7E, 0x00, + 0x00, 0xE0, 0x00, 0xCC, 0xCC, 0xCC, 0x7E, 0x00, + 0x00, 0xCC, 0x00, 0xCC, 0xCC, 0x7C, 0x0C, 0xF8, + 0xC3, 0x18, 0x3C, 0x66, 0x66, 0x3C, 0x18, 0x00, + 0xCC, 0x00, 0xCC, 0xCC, 0xCC, 0xCC, 0x78, 0x00, + 0x18, 0x18, 0x7E, 0xC0, 0xC0, 0x7E, 0x18, 0x18, + 0x38, 0x6C, 0x64, 0xF0, 0x60, 0xE6, 0xFC, 0x00, + 0xCC, 0xCC, 0x78, 0xFC, 0x30, 0xFC, 0x30, 0x30, + 0xF8, 0xCC, 0xCC, 0xFA, 0xC6, 0xCF, 0xC6, 0xC7, + 0x0E, 0x1B, 0x18, 0x3C, 0x18, 0x18, 0xD8, 0x70, + 0x1C, 0x00, 0x78, 0x0C, 0x7C, 0xCC, 0x7E, 0x00, + 0x38, 0x00, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, + 0x00, 0x1C, 0x00, 0x78, 0xCC, 0xCC, 0x78, 0x00, + 0x00, 0x1C, 0x00, 0xCC, 0xCC, 0xCC, 0x7E, 0x00, + 0x00, 0xF8, 0x00, 0xF8, 0xCC, 0xCC, 0xCC, 0x00, + 0xFC, 0x00, 0xCC, 0xEC, 0xFC, 0xDC, 0xCC, 0x00, + 0x3C, 0x6C, 0x6C, 0x3E, 0x00, 0x7E, 0x00, 0x00, + 0x38, 0x6C, 0x6C, 0x38, 0x00, 0x7C, 0x00, 0x00, + 0x30, 0x00, 0x30, 0x60, 0xC0, 0xCC, 0x78, 0x00, + 0x00, 0x00, 0x00, 0xFC, 0xC0, 0xC0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFC, 0x0C, 0x0C, 0x00, 0x00, + 0xC3, 0xC6, 0xCC, 0xDE, 0x33, 0x66, 0xCC, 0x0F, + 0xC3, 0xC6, 0xCC, 0xDB, 0x37, 0x6F, 0xCF, 0x03, + 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, + 0x00, 0x33, 0x66, 0xCC, 0x66, 0x33, 0x00, 0x00, + 0x00, 0xCC, 0x66, 0x33, 0x66, 0xCC, 0x00, 0x00, + 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, + 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, + 0xDB, 0x77, 0xDB, 0xEE, 0xDB, 0x77, 0xDB, 0xEE, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0xF8, 0x18, 0x18, 0x18, + 0x18, 0x18, 0xF8, 0x18, 0xF8, 0x18, 0x18, 0x18, + 0x36, 0x36, 0x36, 0x36, 0xF6, 0x36, 0x36, 0x36, + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x36, 0x36, 0x36, + 0x00, 0x00, 0xF8, 0x18, 0xF8, 0x18, 0x18, 0x18, + 0x36, 0x36, 0xF6, 0x06, 0xF6, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x00, 0x00, 0xFE, 0x06, 0xF6, 0x36, 0x36, 0x36, + 0x36, 0x36, 0xF6, 0x06, 0xFE, 0x00, 0x00, 0x00, + 0x36, 0x36, 0x36, 0x36, 0xFE, 0x00, 0x00, 0x00, + 0x18, 0x18, 0xF8, 0x18, 0xF8, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xF8, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x1F, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0xFF, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xFF, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x1F, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x1F, 0x18, 0x1F, 0x18, 0x18, 0x18, + 0x36, 0x36, 0x36, 0x36, 0x37, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x37, 0x30, 0x3F, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3F, 0x30, 0x37, 0x36, 0x36, 0x36, + 0x36, 0x36, 0xF7, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFF, 0x00, 0xF7, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x37, 0x30, 0x37, 0x36, 0x36, 0x36, + 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x36, 0x36, 0xF7, 0x00, 0xF7, 0x36, 0x36, 0x36, + 0x18, 0x18, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x36, 0x36, 0x36, 0x36, 0xFF, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0xFF, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x3F, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x1F, 0x18, 0x1F, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x1F, 0x18, 0x1F, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0x3F, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0xFF, 0x36, 0x36, 0x36, + 0x18, 0x18, 0xFF, 0x18, 0xFF, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0xF8, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x1F, 0x18, 0x18, 0x18, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, + 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x76, 0xDC, 0xC8, 0xDC, 0x76, 0x00, + 0x00, 0x78, 0xCC, 0xF8, 0xCC, 0xF8, 0xC0, 0xC0, + 0x00, 0xFC, 0xCC, 0xC0, 0xC0, 0xC0, 0xC0, 0x00, + 0x00, 0xFE, 0x6C, 0x6C, 0x6C, 0x6C, 0x6C, 0x00, + 0xFC, 0xCC, 0x60, 0x30, 0x60, 0xCC, 0xFC, 0x00, + 0x00, 0x00, 0x7E, 0xD8, 0xD8, 0xD8, 0x70, 0x00, + 0x00, 0x66, 0x66, 0x66, 0x66, 0x7C, 0x60, 0xC0, + 0x00, 0x76, 0xDC, 0x18, 0x18, 0x18, 0x18, 0x00, + 0xFC, 0x30, 0x78, 0xCC, 0xCC, 0x78, 0x30, 0xFC, + 0x38, 0x6C, 0xC6, 0xFE, 0xC6, 0x6C, 0x38, 0x00, + 0x38, 0x6C, 0xC6, 0xC6, 0x6C, 0x6C, 0xEE, 0x00, + 0x1C, 0x30, 0x18, 0x7C, 0xCC, 0xCC, 0x78, 0x00, + 0x00, 0x00, 0x7E, 0xDB, 0xDB, 0x7E, 0x00, 0x00, + 0x06, 0x0C, 0x7E, 0xDB, 0xDB, 0x7E, 0x60, 0xC0, + 0x38, 0x60, 0xC0, 0xF8, 0xC0, 0x60, 0x38, 0x00, + 0x78, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0x00, + 0x00, 0xFC, 0x00, 0xFC, 0x00, 0xFC, 0x00, 0x00, + 0x30, 0x30, 0xFC, 0x30, 0x30, 0x00, 0xFC, 0x00, + 0x60, 0x30, 0x18, 0x30, 0x60, 0x00, 0xFC, 0x00, + 0x18, 0x30, 0x60, 0x30, 0x18, 0x00, 0xFC, 0x00, + 0x0E, 0x1B, 0x1B, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0xD8, 0xD8, 0x70, + 0x30, 0x30, 0x00, 0xFC, 0x00, 0x30, 0x30, 0x00, + 0x00, 0x76, 0xDC, 0x00, 0x76, 0xDC, 0x00, 0x00, + 0x38, 0x6C, 0x6C, 0x38, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, + 0x0F, 0x0C, 0x0C, 0x0C, 0xEC, 0x6C, 0x3C, 0x1C, + 0x78, 0x6C, 0x6C, 0x6C, 0x6C, 0x00, 0x00, 0x00, + 0x70, 0x18, 0x30, 0x60, 0x78, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/engines/agi/global.cpp b/engines/agi/global.cpp index 36cc547a8d..faea416590 100644 --- a/engines/agi/global.cpp +++ b/engines/agi/global.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp index 5af68e9b5e..1b8223b051 100644 --- a/engines/agi/graphics.cpp +++ b/engines/agi/graphics.cpp @@ -24,7 +24,7 @@ */ #include "common/file.h" -#include "common/stdafx.h" + #include "graphics/cursorman.h" @@ -246,261 +246,261 @@ uint8 newPalette[16 * 3] = { * Uses full 8 bits per color component. */ uint8 vgaPalette[256 * 3] = { - 0x00, 0x00, 0x00, - 0x00, 0x00, 0xA8, - 0x00, 0xA8, 0x00, - 0x00, 0xA8, 0xA8, - 0xA8, 0x00, 0x00, - 0xA8, 0x00, 0xA8, - 0xA8, 0x54, 0x00, - 0xA8, 0xA8, 0xA8, - 0x54, 0x54, 0x54, - 0x54, 0x54, 0xFC, - 0x54, 0xFC, 0x54, - 0x54, 0xFC, 0xFC, - 0xFC, 0x54, 0x54, - 0xFC, 0x54, 0xFC, - 0xFC, 0xFC, 0x54, - 0xFC, 0xFC, 0xFC, - 0x00, 0x00, 0x00, - 0x14, 0x14, 0x14, - 0x20, 0x20, 0x20, - 0x2C, 0x2C, 0x2C, - 0x38, 0x38, 0x38, - 0x44, 0x44, 0x44, - 0x50, 0x50, 0x50, - 0x60, 0x60, 0x60, - 0x70, 0x70, 0x70, - 0x80, 0x80, 0x80, - 0x90, 0x90, 0x90, - 0xA0, 0xA0, 0xA0, - 0xB4, 0xB4, 0xB4, - 0xC8, 0xC8, 0xC8, - 0xE0, 0xE0, 0xE0, - 0xFC, 0xFC, 0xFC, - 0x00, 0x00, 0xFC, - 0x40, 0x00, 0xFC, - 0x7C, 0x00, 0xFC, - 0xBC, 0x00, 0xFC, - 0xFC, 0x00, 0xFC, - 0xFC, 0x00, 0xBC, - 0xFC, 0x00, 0x7C, - 0xFC, 0x00, 0x40, - 0xFC, 0x00, 0x00, - 0xFC, 0x40, 0x00, - 0xFC, 0x7C, 0x00, - 0xFC, 0xBC, 0x00, - 0xFC, 0xFC, 0x00, - 0xBC, 0xFC, 0x00, - 0x7C, 0xFC, 0x00, - 0x40, 0xFC, 0x00, - 0x00, 0xFC, 0x00, - 0x00, 0xFC, 0x40, - 0x00, 0xFC, 0x7C, - 0x00, 0xFC, 0xBC, - 0x00, 0xFC, 0xFC, - 0x00, 0xBC, 0xFC, - 0x00, 0x7C, 0xFC, - 0x00, 0x40, 0xFC, - 0x7C, 0x7C, 0xFC, - 0x9C, 0x7C, 0xFC, - 0xBC, 0x7C, 0xFC, - 0xDC, 0x7C, 0xFC, - 0xFC, 0x7C, 0xFC, - 0xFC, 0x7C, 0xDC, - 0xFC, 0x7C, 0xBC, - 0xFC, 0x7C, 0x9C, - 0xFC, 0x7C, 0x7C, - 0xFC, 0x9C, 0x7C, - 0xFC, 0xBC, 0x7C, - 0xFC, 0xDC, 0x7C, - 0xFC, 0xFC, 0x7C, - 0xDC, 0xFC, 0x7C, - 0xBC, 0xFC, 0x7C, - 0x9C, 0xFC, 0x7C, - 0x7C, 0xFC, 0x7C, - 0x7C, 0xFC, 0x9C, - 0x7C, 0xFC, 0xBC, - 0x7C, 0xFC, 0xDC, - 0x7C, 0xFC, 0xFC, - 0x7C, 0xDC, 0xFC, - 0x7C, 0xBC, 0xFC, - 0x7C, 0x9C, 0xFC, - 0xB4, 0xB4, 0xFC, - 0xC4, 0xB4, 0xFC, - 0xD8, 0xB4, 0xFC, - 0xE8, 0xB4, 0xFC, - 0xFC, 0xB4, 0xFC, - 0xFC, 0xB4, 0xE8, - 0xFC, 0xB4, 0xD8, - 0xFC, 0xB4, 0xC4, - 0xFC, 0xB4, 0xB4, - 0xFC, 0xC4, 0xB4, - 0xFC, 0xD8, 0xB4, - 0xFC, 0xE8, 0xB4, - 0xFC, 0xFC, 0xB4, - 0xE8, 0xFC, 0xB4, - 0xD8, 0xFC, 0xB4, - 0xC4, 0xFC, 0xB4, - 0xB4, 0xFC, 0xB4, - 0xB4, 0xFC, 0xC4, - 0xB4, 0xFC, 0xD8, - 0xB4, 0xFC, 0xE8, - 0xB4, 0xFC, 0xFC, - 0xB4, 0xE8, 0xFC, - 0xB4, 0xD8, 0xFC, - 0xB4, 0xC4, 0xFC, - 0x00, 0x00, 0x70, - 0x1C, 0x00, 0x70, - 0x38, 0x00, 0x70, - 0x54, 0x00, 0x70, - 0x70, 0x00, 0x70, - 0x70, 0x00, 0x54, - 0x70, 0x00, 0x38, - 0x70, 0x00, 0x1C, - 0x70, 0x00, 0x00, - 0x70, 0x1C, 0x00, - 0x70, 0x38, 0x00, - 0x70, 0x54, 0x00, - 0x70, 0x70, 0x00, - 0x54, 0x70, 0x00, - 0x38, 0x70, 0x00, - 0x1C, 0x70, 0x00, - 0x00, 0x70, 0x00, - 0x00, 0x70, 0x1C, - 0x00, 0x70, 0x38, - 0x00, 0x70, 0x54, - 0x00, 0x70, 0x70, - 0x00, 0x54, 0x70, - 0x00, 0x38, 0x70, - 0x00, 0x1C, 0x70, - 0x38, 0x38, 0x70, - 0x44, 0x38, 0x70, - 0x54, 0x38, 0x70, - 0x60, 0x38, 0x70, - 0x70, 0x38, 0x70, - 0x70, 0x38, 0x60, - 0x70, 0x38, 0x54, - 0x70, 0x38, 0x44, - 0x70, 0x38, 0x38, - 0x70, 0x44, 0x38, - 0x70, 0x54, 0x38, - 0x70, 0x60, 0x38, - 0x70, 0x70, 0x38, - 0x60, 0x70, 0x38, - 0x54, 0x70, 0x38, - 0x44, 0x70, 0x38, - 0x38, 0x70, 0x38, - 0x38, 0x70, 0x44, - 0x38, 0x70, 0x54, - 0x38, 0x70, 0x60, - 0x38, 0x70, 0x70, - 0x38, 0x60, 0x70, - 0x38, 0x54, 0x70, - 0x38, 0x44, 0x70, - 0x50, 0x50, 0x70, - 0x58, 0x50, 0x70, - 0x60, 0x50, 0x70, - 0x68, 0x50, 0x70, - 0x70, 0x50, 0x70, - 0x70, 0x50, 0x68, - 0x70, 0x50, 0x60, - 0x70, 0x50, 0x58, - 0x70, 0x50, 0x50, - 0x70, 0x58, 0x50, - 0x70, 0x60, 0x50, - 0x70, 0x68, 0x50, - 0x70, 0x70, 0x50, - 0x68, 0x70, 0x50, - 0x60, 0x70, 0x50, - 0x58, 0x70, 0x50, - 0x50, 0x70, 0x50, - 0x50, 0x70, 0x58, - 0x50, 0x70, 0x60, - 0x50, 0x70, 0x68, - 0x50, 0x70, 0x70, - 0x50, 0x68, 0x70, - 0x50, 0x60, 0x70, - 0x50, 0x58, 0x70, - 0x00, 0x00, 0x40, - 0x10, 0x00, 0x40, - 0x20, 0x00, 0x40, - 0x30, 0x00, 0x40, - 0x40, 0x00, 0x40, - 0x40, 0x00, 0x30, - 0x40, 0x00, 0x20, - 0x40, 0x00, 0x10, - 0x40, 0x00, 0x00, - 0x40, 0x10, 0x00, - 0x40, 0x20, 0x00, - 0x40, 0x30, 0x00, - 0x40, 0x40, 0x00, - 0x30, 0x40, 0x00, - 0x20, 0x40, 0x00, - 0x10, 0x40, 0x00, - 0x00, 0x40, 0x00, - 0x00, 0x40, 0x10, - 0x00, 0x40, 0x20, - 0x00, 0x40, 0x30, - 0x00, 0x40, 0x40, - 0x00, 0x30, 0x40, - 0x00, 0x20, 0x40, - 0x00, 0x10, 0x40, - 0x20, 0x20, 0x40, - 0x28, 0x20, 0x40, - 0x30, 0x20, 0x40, - 0x38, 0x20, 0x40, - 0x40, 0x20, 0x40, - 0x40, 0x20, 0x38, - 0x40, 0x20, 0x30, - 0x40, 0x20, 0x28, - 0x40, 0x20, 0x20, - 0x40, 0x28, 0x20, - 0x40, 0x30, 0x20, - 0x40, 0x38, 0x20, - 0x40, 0x40, 0x20, - 0x38, 0x40, 0x20, - 0x30, 0x40, 0x20, - 0x28, 0x40, 0x20, - 0x20, 0x40, 0x20, - 0x20, 0x40, 0x28, - 0x20, 0x40, 0x30, - 0x20, 0x40, 0x38, - 0x20, 0x40, 0x40, - 0x20, 0x38, 0x40, - 0x20, 0x30, 0x40, - 0x20, 0x28, 0x40, - 0x2C, 0x2C, 0x40, - 0x30, 0x2C, 0x40, - 0x34, 0x2C, 0x40, - 0x3C, 0x2C, 0x40, - 0x40, 0x2C, 0x40, - 0x40, 0x2C, 0x3C, - 0x40, 0x2C, 0x34, - 0x40, 0x2C, 0x30, - 0x40, 0x2C, 0x2C, - 0x40, 0x30, 0x2C, - 0x40, 0x34, 0x2C, - 0x40, 0x3C, 0x2C, - 0x40, 0x40, 0x2C, - 0x3C, 0x40, 0x2C, - 0x34, 0x40, 0x2C, - 0x30, 0x40, 0x2C, - 0x2C, 0x40, 0x2C, - 0x2C, 0x40, 0x30, - 0x2C, 0x40, 0x34, - 0x2C, 0x40, 0x3C, - 0x2C, 0x40, 0x40, - 0x2C, 0x3C, 0x40, - 0x2C, 0x34, 0x40, - 0x2C, 0x30, 0x40, - 0x40, 0x40, 0x40, - 0x38, 0x38, 0x38, - 0x30, 0x30, 0x30, - 0x28, 0x28, 0x28, - 0x24, 0x24, 0x24, - 0x1C, 0x1C, 0x1C, - 0x14, 0x14, 0x14, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0xA8, + 0x00, 0xA8, 0x00, + 0x00, 0xA8, 0xA8, + 0xA8, 0x00, 0x00, + 0xA8, 0x00, 0xA8, + 0xA8, 0x54, 0x00, + 0xA8, 0xA8, 0xA8, + 0x54, 0x54, 0x54, + 0x54, 0x54, 0xFC, + 0x54, 0xFC, 0x54, + 0x54, 0xFC, 0xFC, + 0xFC, 0x54, 0x54, + 0xFC, 0x54, 0xFC, + 0xFC, 0xFC, 0x54, + 0xFC, 0xFC, 0xFC, + 0x00, 0x00, 0x00, + 0x14, 0x14, 0x14, + 0x20, 0x20, 0x20, + 0x2C, 0x2C, 0x2C, + 0x38, 0x38, 0x38, + 0x44, 0x44, 0x44, + 0x50, 0x50, 0x50, + 0x60, 0x60, 0x60, + 0x70, 0x70, 0x70, + 0x80, 0x80, 0x80, + 0x90, 0x90, 0x90, + 0xA0, 0xA0, 0xA0, + 0xB4, 0xB4, 0xB4, + 0xC8, 0xC8, 0xC8, + 0xE0, 0xE0, 0xE0, + 0xFC, 0xFC, 0xFC, + 0x00, 0x00, 0xFC, + 0x40, 0x00, 0xFC, + 0x7C, 0x00, 0xFC, + 0xBC, 0x00, 0xFC, + 0xFC, 0x00, 0xFC, + 0xFC, 0x00, 0xBC, + 0xFC, 0x00, 0x7C, + 0xFC, 0x00, 0x40, + 0xFC, 0x00, 0x00, + 0xFC, 0x40, 0x00, + 0xFC, 0x7C, 0x00, + 0xFC, 0xBC, 0x00, + 0xFC, 0xFC, 0x00, + 0xBC, 0xFC, 0x00, + 0x7C, 0xFC, 0x00, + 0x40, 0xFC, 0x00, + 0x00, 0xFC, 0x00, + 0x00, 0xFC, 0x40, + 0x00, 0xFC, 0x7C, + 0x00, 0xFC, 0xBC, + 0x00, 0xFC, 0xFC, + 0x00, 0xBC, 0xFC, + 0x00, 0x7C, 0xFC, + 0x00, 0x40, 0xFC, + 0x7C, 0x7C, 0xFC, + 0x9C, 0x7C, 0xFC, + 0xBC, 0x7C, 0xFC, + 0xDC, 0x7C, 0xFC, + 0xFC, 0x7C, 0xFC, + 0xFC, 0x7C, 0xDC, + 0xFC, 0x7C, 0xBC, + 0xFC, 0x7C, 0x9C, + 0xFC, 0x7C, 0x7C, + 0xFC, 0x9C, 0x7C, + 0xFC, 0xBC, 0x7C, + 0xFC, 0xDC, 0x7C, + 0xFC, 0xFC, 0x7C, + 0xDC, 0xFC, 0x7C, + 0xBC, 0xFC, 0x7C, + 0x9C, 0xFC, 0x7C, + 0x7C, 0xFC, 0x7C, + 0x7C, 0xFC, 0x9C, + 0x7C, 0xFC, 0xBC, + 0x7C, 0xFC, 0xDC, + 0x7C, 0xFC, 0xFC, + 0x7C, 0xDC, 0xFC, + 0x7C, 0xBC, 0xFC, + 0x7C, 0x9C, 0xFC, + 0xB4, 0xB4, 0xFC, + 0xC4, 0xB4, 0xFC, + 0xD8, 0xB4, 0xFC, + 0xE8, 0xB4, 0xFC, + 0xFC, 0xB4, 0xFC, + 0xFC, 0xB4, 0xE8, + 0xFC, 0xB4, 0xD8, + 0xFC, 0xB4, 0xC4, + 0xFC, 0xB4, 0xB4, + 0xFC, 0xC4, 0xB4, + 0xFC, 0xD8, 0xB4, + 0xFC, 0xE8, 0xB4, + 0xFC, 0xFC, 0xB4, + 0xE8, 0xFC, 0xB4, + 0xD8, 0xFC, 0xB4, + 0xC4, 0xFC, 0xB4, + 0xB4, 0xFC, 0xB4, + 0xB4, 0xFC, 0xC4, + 0xB4, 0xFC, 0xD8, + 0xB4, 0xFC, 0xE8, + 0xB4, 0xFC, 0xFC, + 0xB4, 0xE8, 0xFC, + 0xB4, 0xD8, 0xFC, + 0xB4, 0xC4, 0xFC, + 0x00, 0x00, 0x70, + 0x1C, 0x00, 0x70, + 0x38, 0x00, 0x70, + 0x54, 0x00, 0x70, + 0x70, 0x00, 0x70, + 0x70, 0x00, 0x54, + 0x70, 0x00, 0x38, + 0x70, 0x00, 0x1C, + 0x70, 0x00, 0x00, + 0x70, 0x1C, 0x00, + 0x70, 0x38, 0x00, + 0x70, 0x54, 0x00, + 0x70, 0x70, 0x00, + 0x54, 0x70, 0x00, + 0x38, 0x70, 0x00, + 0x1C, 0x70, 0x00, + 0x00, 0x70, 0x00, + 0x00, 0x70, 0x1C, + 0x00, 0x70, 0x38, + 0x00, 0x70, 0x54, + 0x00, 0x70, 0x70, + 0x00, 0x54, 0x70, + 0x00, 0x38, 0x70, + 0x00, 0x1C, 0x70, + 0x38, 0x38, 0x70, + 0x44, 0x38, 0x70, + 0x54, 0x38, 0x70, + 0x60, 0x38, 0x70, + 0x70, 0x38, 0x70, + 0x70, 0x38, 0x60, + 0x70, 0x38, 0x54, + 0x70, 0x38, 0x44, + 0x70, 0x38, 0x38, + 0x70, 0x44, 0x38, + 0x70, 0x54, 0x38, + 0x70, 0x60, 0x38, + 0x70, 0x70, 0x38, + 0x60, 0x70, 0x38, + 0x54, 0x70, 0x38, + 0x44, 0x70, 0x38, + 0x38, 0x70, 0x38, + 0x38, 0x70, 0x44, + 0x38, 0x70, 0x54, + 0x38, 0x70, 0x60, + 0x38, 0x70, 0x70, + 0x38, 0x60, 0x70, + 0x38, 0x54, 0x70, + 0x38, 0x44, 0x70, + 0x50, 0x50, 0x70, + 0x58, 0x50, 0x70, + 0x60, 0x50, 0x70, + 0x68, 0x50, 0x70, + 0x70, 0x50, 0x70, + 0x70, 0x50, 0x68, + 0x70, 0x50, 0x60, + 0x70, 0x50, 0x58, + 0x70, 0x50, 0x50, + 0x70, 0x58, 0x50, + 0x70, 0x60, 0x50, + 0x70, 0x68, 0x50, + 0x70, 0x70, 0x50, + 0x68, 0x70, 0x50, + 0x60, 0x70, 0x50, + 0x58, 0x70, 0x50, + 0x50, 0x70, 0x50, + 0x50, 0x70, 0x58, + 0x50, 0x70, 0x60, + 0x50, 0x70, 0x68, + 0x50, 0x70, 0x70, + 0x50, 0x68, 0x70, + 0x50, 0x60, 0x70, + 0x50, 0x58, 0x70, + 0x00, 0x00, 0x40, + 0x10, 0x00, 0x40, + 0x20, 0x00, 0x40, + 0x30, 0x00, 0x40, + 0x40, 0x00, 0x40, + 0x40, 0x00, 0x30, + 0x40, 0x00, 0x20, + 0x40, 0x00, 0x10, + 0x40, 0x00, 0x00, + 0x40, 0x10, 0x00, + 0x40, 0x20, 0x00, + 0x40, 0x30, 0x00, + 0x40, 0x40, 0x00, + 0x30, 0x40, 0x00, + 0x20, 0x40, 0x00, + 0x10, 0x40, 0x00, + 0x00, 0x40, 0x00, + 0x00, 0x40, 0x10, + 0x00, 0x40, 0x20, + 0x00, 0x40, 0x30, + 0x00, 0x40, 0x40, + 0x00, 0x30, 0x40, + 0x00, 0x20, 0x40, + 0x00, 0x10, 0x40, + 0x20, 0x20, 0x40, + 0x28, 0x20, 0x40, + 0x30, 0x20, 0x40, + 0x38, 0x20, 0x40, + 0x40, 0x20, 0x40, + 0x40, 0x20, 0x38, + 0x40, 0x20, 0x30, + 0x40, 0x20, 0x28, + 0x40, 0x20, 0x20, + 0x40, 0x28, 0x20, + 0x40, 0x30, 0x20, + 0x40, 0x38, 0x20, + 0x40, 0x40, 0x20, + 0x38, 0x40, 0x20, + 0x30, 0x40, 0x20, + 0x28, 0x40, 0x20, + 0x20, 0x40, 0x20, + 0x20, 0x40, 0x28, + 0x20, 0x40, 0x30, + 0x20, 0x40, 0x38, + 0x20, 0x40, 0x40, + 0x20, 0x38, 0x40, + 0x20, 0x30, 0x40, + 0x20, 0x28, 0x40, + 0x2C, 0x2C, 0x40, + 0x30, 0x2C, 0x40, + 0x34, 0x2C, 0x40, + 0x3C, 0x2C, 0x40, + 0x40, 0x2C, 0x40, + 0x40, 0x2C, 0x3C, + 0x40, 0x2C, 0x34, + 0x40, 0x2C, 0x30, + 0x40, 0x2C, 0x2C, + 0x40, 0x30, 0x2C, + 0x40, 0x34, 0x2C, + 0x40, 0x3C, 0x2C, + 0x40, 0x40, 0x2C, + 0x3C, 0x40, 0x2C, + 0x34, 0x40, 0x2C, + 0x30, 0x40, 0x2C, + 0x2C, 0x40, 0x2C, + 0x2C, 0x40, 0x30, + 0x2C, 0x40, 0x34, + 0x2C, 0x40, 0x3C, + 0x2C, 0x40, 0x40, + 0x2C, 0x3C, 0x40, + 0x2C, 0x34, 0x40, + 0x2C, 0x30, 0x40, + 0x40, 0x40, 0x40, + 0x38, 0x38, 0x38, + 0x30, 0x30, 0x30, + 0x28, 0x28, 0x28, + 0x24, 0x24, 0x24, + 0x1C, 0x1C, 0x1C, + 0x14, 0x14, 0x14, 0x0C, 0x0C, 0x0C }; @@ -737,7 +737,7 @@ void GfxMgr::drawCurrentStyleButton(int x, int y, const char *label, bool hasFoc int textOffset = _vm->_buttonStyle.getTextOffset(hasFocus, pressed); AgiTextColor color = _vm->_buttonStyle.getColor(hasFocus, pressed, positive); bool border = _vm->_buttonStyle.getBorder(hasFocus, pressed); - + rawDrawButton(x, y, label, color.fg, color.bg, border, textOffset); } @@ -753,7 +753,7 @@ void GfxMgr::rawDrawButton(int x, int y, const char *s, int fgcolor, int bgcolor // Draw a filled rectangle that's larger than the button. Used for drawing // a border around the button as the button itself is drawn after this. drawRectangle(x1, y1, x2, y2, border ? BUTTON_BORDER : MSG_BOX_COLOUR); - + while (*s) { putTextCharacter(0, x + textOffset, y + textOffset, *s++, fgcolor, bgcolor); x += CHAR_COLS; diff --git a/engines/agi/graphics.h b/engines/agi/graphics.h index 96b6247aeb..9981c0d76a 100644 --- a/engines/agi/graphics.h +++ b/engines/agi/graphics.h @@ -26,7 +26,7 @@ #ifndef AGI_GRAPHICS_H #define AGI_GRAPHICS_H -#include "common/stdafx.h" + #include "agi/font.h" namespace Agi { diff --git a/engines/agi/id.cpp b/engines/agi/id.cpp index aba19eb64d..7286738be3 100644 --- a/engines/agi/id.cpp +++ b/engines/agi/id.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" #include "agi/opcodes.h" diff --git a/engines/agi/inv.cpp b/engines/agi/inv.cpp index d05570c957..eb4917c322 100644 --- a/engines/agi/inv.cpp +++ b/engines/agi/inv.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" #include "agi/sprite.h" @@ -138,7 +138,7 @@ void AgiEngine::selectItems(int n) { default: break; } - + if (!exit_select) { showItems(); _gfx->doUpdate(); diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp index 2b7559f754..c4532941d6 100644 --- a/engines/agi/keyboard.cpp +++ b/engines/agi/keyboard.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" #include "agi/graphics.h" @@ -109,7 +109,7 @@ int AgiEngine::handleController(int key) { // AGI 3.149 games and The Black Cauldron need KEY_ESCAPE to use menus // Games with the GF_ESCPAUSE flag need KEY_ESCAPE to pause the game - if (key == 0 || + if (key == 0 || (key == KEY_ESCAPE && agiGetRelease() != 0x3149 && getGameID() != GID_BC && !(getFeatures() & GF_ESCPAUSE)) ) return false; diff --git a/engines/agi/keyboard.h b/engines/agi/keyboard.h index 3475f76ee4..5a96364acd 100644 --- a/engines/agi/keyboard.h +++ b/engines/agi/keyboard.h @@ -26,7 +26,7 @@ #ifndef AGI_KEYBOARD_H #define AGI_KEYBOARD_H -#include "common/stdafx.h" + namespace Agi { diff --git a/engines/agi/loader_v2.cpp b/engines/agi/loader_v2.cpp index c0c6df2fcb..3c5bbf900a 100644 --- a/engines/agi/loader_v2.cpp +++ b/engines/agi/loader_v2.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/file.h" #include "agi/agi.h" diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp index 362d778c66..dcf7d83809 100644 --- a/engines/agi/loader_v3.cpp +++ b/engines/agi/loader_v3.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "agi/agi.h" #include "agi/lzw.h" diff --git a/engines/agi/logic.cpp b/engines/agi/logic.cpp index 210684b0bc..4d7cc330c9 100644 --- a/engines/agi/logic.cpp +++ b/engines/agi/logic.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" diff --git a/engines/agi/logic.h b/engines/agi/logic.h index a6c0afa6bf..825ad554e5 100644 --- a/engines/agi/logic.h +++ b/engines/agi/logic.h @@ -26,7 +26,7 @@ #ifndef AGI_LOGIC_H #define AGI_LOGIC_H -#include "common/stdafx.h" + #include "common/scummsys.h" namespace Agi { diff --git a/engines/agi/lzw.cpp b/engines/agi/lzw.cpp index f0c7fd06b6..aa926b0158 100644 --- a/engines/agi/lzw.cpp +++ b/engines/agi/lzw.cpp @@ -33,7 +33,7 @@ ** (c) 1997 Lance Ewing ***************************************************************************/ -#include "common/stdafx.h" + #include "agi/agi.h" #include "agi/lzw.h" diff --git a/engines/agi/menu.cpp b/engines/agi/menu.cpp index 7aa7f5e55d..916c4c184f 100644 --- a/engines/agi/menu.cpp +++ b/engines/agi/menu.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" #include "agi/sprite.h" @@ -66,7 +66,7 @@ AgiMenu *Menu::getMenu(int i) { AgiMenuOption *Menu::getMenuOption(int i, int j) { AgiMenu *m = getMenu(i); MenuOptionList::iterator iter; - for (iter = m->down.begin(); iter != m->down.end(); ++iter) { + for (iter = m->down.begin(); iter != m->down.end(); ++iter) { AgiMenuOption* d = *iter; if (d->index == j) return d; @@ -80,7 +80,7 @@ void Menu::drawMenuBar() { _vm->flushLines(0, 0); MenuList::iterator iter; - for (iter = _menubar.begin(); iter != _menubar.end(); ++iter) { + for (iter = _menubar.begin(); iter != _menubar.end(); ++iter) { AgiMenu *m = *iter; _vm->printText(m->text, 0, m->col, 0, 40, MENU_FG, MENU_BG); } @@ -103,7 +103,7 @@ void Menu::drawMenuOption(int hMenu) { (1 + m->height + 2) * CHAR_LINES, MENU_BG, MENU_LINE, 0); MenuOptionList::iterator iter; - for (iter = m->down.begin(); iter != m->down.end(); ++iter) { + for (iter = m->down.begin(); iter != m->down.end(); ++iter) { AgiMenuOption* d = *iter; _vm->printText(d->text, 0, m->wincol + 1, d->index + 2, m->width + 2, MENU_FG, MENU_BG, !d->enabled); diff --git a/engines/agi/motion.cpp b/engines/agi/motion.cpp index 05477c0d99..58d4eb4a6d 100644 --- a/engines/agi/motion.cpp +++ b/engines/agi/motion.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" diff --git a/engines/agi/objects.cpp b/engines/agi/objects.cpp index 4c49a6014b..eb33259b82 100644 --- a/engines/agi/objects.cpp +++ b/engines/agi/objects.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp index 5097b43c08..05d5d91572 100644 --- a/engines/agi/op_cmd.cpp +++ b/engines/agi/op_cmd.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "base/version.h" #include "agi/agi.h" @@ -261,7 +261,7 @@ cmd(set_priority) { // the dwarf to be drawn behind ego // With this workaround, when the game scripts set the priority of view 152 // (seventh dwarf with soup bowls), ego's priority is set to 7 - // The game script itself sets priotity 8 for ego before she starts walking, + // The game script itself sets priotity 8 for ego before she starts walking, // and then releases the fixed priority set on ego after ego is seated // Therefore, this workaround only affects that specific part of this scene // Ego is set to object 19 by script 54 @@ -625,11 +625,11 @@ cmd(draw_pic) { // behavior from view 46 (the spider droid). View 46 is supposed to // follow ego and explode when it comes in contact with him. However, as // flag 103 is not reset correctly, when the player goes down the path - // and back up, the spider is always at the base of the path (since it - // can't go up) and kills the player when he goes down at ground level - // (although the spider droid sprite itself seems to be correctly positioned). - // With this workaround, when the player goes back to picture 20 (1 screen - // above the ground), flag 103 is reset, thereby fixing this issue. Note + // and back up, the spider is always at the base of the path (since it + // can't go up) and kills the player when he goes down at ground level + // (although the spider droid sprite itself seems to be correctly positioned). + // With this workaround, when the player goes back to picture 20 (1 screen + // above the ground), flag 103 is reset, thereby fixing this issue. Note // that this is a script bug and occurs in the original interpreter as well. // Fixes bug #1658514: AGI: SQ1 (2.2 DOS ENG) bizzare exploding roger if (g_agi->getGameID() == GID_SQ1 && _v[p0] == 20) @@ -720,8 +720,8 @@ cmd(draw) { // cause regressions with some AGI games. The original workaround no longer // works for Space Trek in ScummVM, as all fanmade games are set to use // AGI version 2.917, but it applies to all other games where AGI version is - // <= 2.440, which was not the original purpose of this workaround. It is - // assumed that this bug is caused by AGI Studio, so this applies to all + // <= 2.440, which was not the original purpose of this workaround. It is + // assumed that this bug is caused by AGI Studio, so this applies to all // fanmade games only. // TODO: Investigate this further and check if any other fanmade AGI // games are affected. If yes, then it'd be best to set this for Space @@ -1310,7 +1310,7 @@ cmd(shake_screen) { } else { warning("It looks like GF_AGIPAL flag is missing"); } - } + } // Disables input while shaking to prevent bug // #1678230: AGI: Entering text while screen is shaking diff --git a/engines/agi/op_dbg.cpp b/engines/agi/op_dbg.cpp index 7b0a8f8082..d1a8aa5909 100644 --- a/engines/agi/op_dbg.cpp +++ b/engines/agi/op_dbg.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" #include "agi/opcodes.h" diff --git a/engines/agi/op_test.cpp b/engines/agi/op_test.cpp index 0baa130daf..6c33133210 100644 --- a/engines/agi/op_test.cpp +++ b/engines/agi/op_test.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" #include "agi/keyboard.h" @@ -177,14 +177,14 @@ static uint8 testSaid(uint8 nwords, uint8 *cc) { * if (nwords != num_ego_words) * return false; * - * In the disco scene in Larry 1 when you type "examine blonde", + * In the disco scene in Larry 1 when you type "examine blonde", * inside the logic is expected ( said("examine", "blonde", "rol") ) * where word("rol") = 9999 * * According to the interpreter code 9999 means that whatever the * user typed should be correct, but it looks like code 9999 means that * if the string is empty at this point, the entry is also correct... - * + * * With the removal of this code, the behaviour of the scene was * corrected */ @@ -368,7 +368,7 @@ int AgiEngine::testIfCode(int lognum) { * goto Label1; * } * - * The bytecode is: + * The bytecode is: * ff fc 07 04 fd 07 02 01 1e 02 01 1e 01 fc ff */ diff --git a/engines/agi/picture.cpp b/engines/agi/picture.cpp index 21e3daced5..27c19d2eaa 100644 --- a/engines/agi/picture.cpp +++ b/engines/agi/picture.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agi/agi.h" #include "agi/graphics.h" @@ -34,7 +34,7 @@ namespace Agi { PictureMgr::PictureMgr(AgiBase *agi, GfxMgr *gfx) { _vm = agi; _gfx = gfx; - + _data = NULL; _flen = _foffs = 0; @@ -423,16 +423,16 @@ void PictureMgr::fill() { **************************************************************************/ void PictureMgr::plotPattern(int x, int y) { - static const uint16 binary_list[] = {0x8000, 0x4000, 0x2000, 0x1000, 0x800, 0x400, 0x200, 0x100, + static const uint16 binary_list[] = {0x8000, 0x4000, 0x2000, 0x1000, 0x800, 0x400, 0x200, 0x100, 0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2, 0x1}; static const uint8 circle_list[] = {0, 1, 4, 9, 16, 25, 37, 50}; static const uint16 circle_data[] = - {0x8000, - 0xE000, 0xE000, 0xE000, - 0x7000, 0xF800, 0x0F800, 0x0F800, 0x7000, - 0x3800, 0x7C00, 0x0FE00, 0x0FE00, 0x0FE00, 0x7C00, 0x3800, + {0x8000, + 0xE000, 0xE000, 0xE000, + 0x7000, 0xF800, 0x0F800, 0x0F800, 0x7000, + 0x3800, 0x7C00, 0x0FE00, 0x0FE00, 0x0FE00, 0x7C00, 0x3800, 0x1C00, 0x7F00, 0x0FF80, 0x0FF80, 0x0FF80, 0x0FF80, 0x0FF80, 0x7F00, 0x1C00, 0x0E00, 0x3F80, 0x7FC0, 0x7FC0, 0x0FFE0, 0x0FFE0, 0x0FFE0, 0x7FC0, 0x7FC0, 0x3F80, 0x1F00, 0x0E00, 0x0F80, 0x3FE0, 0x7FF0, 0x7FF0, 0x0FFF8, 0x0FFF8, 0x0FFF8, 0x0FFF8, 0x0FFF8, 0x7FF0, 0x7FF0, 0x3FE0, 0x0F80, @@ -444,7 +444,7 @@ void PictureMgr::plotPattern(int x, int y) { uint16 pen_width = 0; int pen_final_x = 0; int pen_final_y = 0; - + uint8 t = 0; uint8 temp8; uint16 temp16; @@ -455,7 +455,7 @@ void PictureMgr::plotPattern(int x, int y) { uint16 pen_size = (_patCode & 0x07); circle_ptr = &circle_data[circle_list[pen_size]]; - + // setup the X position // = pen_x - pen.size/2 @@ -465,7 +465,7 @@ void PictureMgr::plotPattern(int x, int y) { temp16 = 320 - (2 * pen_size); if (pen_x >= temp16) pen_x = temp16; - + pen_x /= 2; pen_final_x = pen_x; // original starting point?? -> used in plotrelated @@ -477,13 +477,13 @@ void PictureMgr::plotPattern(int x, int y) { temp16 = 167 - (2 * pen_size); if (pen_y >= temp16) pen_y = temp16; - + pen_final_y = pen_y; // used in plotrelated t = (uint8)(texture_num | 0x01); // even - + // new purpose for temp16 - + temp16 =( pen_size<<1) +1; // pen size pen_final_y += temp16; // the last row of this shape temp16 = temp16 << 1; @@ -508,12 +508,12 @@ void PictureMgr::plotPattern(int x, int y) { for (; pen_y < pen_final_y; pen_y++) { circle_word = *circle_ptr++; - + for (counter = 0; counter <= pen_width; counter += counterStep) { if (circleCond || ((binary_list[counter>>1] & circle_word) != 0)) { temp8 = t % 2; t = t >> 1; - if (temp8 != 0) + if (temp8 != 0) t = t ^ 0xB8; // == box plot, != circle plot diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp index b42948ccdb..1ef889a5fa 100644 --- a/engines/agi/preagi.cpp +++ b/engines/agi/preagi.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "common/events.h" #include "common/file.h" #include "common/savefile.h" @@ -115,7 +113,7 @@ PreAgiEngine::PreAgiEngine(OSystem *syst) : AgiBase(syst) { _objects = NULL; _oldMode = -1; - + _firstSlot = 0; */ } @@ -246,7 +244,7 @@ int PreAgiEngine::go() { default: error("Unknown preagi engine"); break; - } + } return 0; } diff --git a/engines/agi/preagi_common.cpp b/engines/agi/preagi_common.cpp index 5e735b896a..b0dba6fb0c 100644 --- a/engines/agi/preagi_common.cpp +++ b/engines/agi/preagi_common.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/events.h" #include "agi/preagi.h" @@ -92,7 +91,7 @@ void PreAgiEngine::clearTextArea() { start = 21; for (int row = start; row < 200 / 8; row++) { - clearRow(row); + clearRow(row); } } diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index 5215d90c21..598938edd4 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/events.h" #include "common/savefile.h" @@ -91,10 +90,10 @@ void Mickey::readDatHdr(char *szFile, MSA_DAT_HEADER *hdr) { void Mickey::readDesc(int iRoom, char *buffer, long buflen) { MSA_DAT_HEADER hdr; char szFile[256] = {0}; - + getDatFileName(iRoom, szFile); readDatHdr(szFile, &hdr); - + Common::File infile; if (!infile.open(szFile)) @@ -113,7 +112,7 @@ void Mickey::readMenu(int iRoom, char *buffer) { getDatFileName(iRoom, szFile); readDatHdr(szFile, &hdr); - + Common::File infile; if (!infile.open(szFile)) @@ -127,7 +126,7 @@ void Mickey::readMenu(int iRoom, char *buffer) { void Mickey::readDatStr(int iDat, int iStr, char *buffer, long buflen) { MSA_DAT_HEADER hdr; char szFile[256] = {0}; - + sprintf(szFile, IDS_MSA_PATH_DAT, IDS_MSA_NAME_DAT[iDat]); readDatHdr(szFile, &hdr); @@ -197,7 +196,7 @@ int Mickey::choose1to9(int ofsPrompt) { void Mickey::printStr(char *buffer) { int pc = 1; int nRows, iCol, iRow; - + nRows = *buffer + IDI_MSA_ROW_MENU_0; _vm->clearTextArea(); @@ -257,16 +256,16 @@ void Mickey::drawMenu(MSA_MENU menu, int sel0, int sel1) { for (iRow = 0; iRow < 2; iRow++) { for (iWord = 0; iWord < menu.row[iRow].count; iWord++) { if (iRow) - sel = sel1; - else + sel = sel1; + else sel = sel0; - if (iWord == sel) - attr = IDA_DEFAULT_REV; - else + if (iWord == sel) + attr = IDA_DEFAULT_REV; + else attr = IDA_DEFAULT; - _vm->drawStr(IDI_MSA_ROW_MENU_0 + iRow, menu.row[iRow].entry[iWord].x0, + _vm->drawStr(IDI_MSA_ROW_MENU_0 + iRow, menu.row[iRow].entry[iWord].x0, attr, (char *)menu.row[iRow].entry[iWord].szText); } } @@ -291,8 +290,8 @@ void Mickey::getMouseMenuSelRow(MSA_MENU menu, int *sel0, int *sel1, int iRow, i } for (iWord = 0; iWord < menu.row[iRow].count; iWord++) { - if ((x >= menu.row[iRow].entry[iWord].x0) && - (x < (int)(menu.row[iRow].entry[iWord].x0 + + if ((x >= menu.row[iRow].entry[iWord].x0) && + (x < (int)(menu.row[iRow].entry[iWord].x0 + strlen((char *)menu.row[iRow].entry[iWord].szText)))) { *sel = iWord; break; @@ -364,7 +363,7 @@ bool Mickey::getMenuSelRow(MSA_MENU menu, int *sel0, int *sel1, int iRow) { _vm->_gfx->setCursorPalette(true); } else if (southIndex >= 0 && (event.mouse.x >= 20 && event.mouse.x <= (IDI_MSA_PIC_WIDTH + 10) * 2) && (event.mouse.y >= IDI_MSA_PIC_HEIGHT - 10 && event.mouse.y <= IDI_MSA_PIC_HEIGHT)) { - _vm->_gfx->setCursorPalette(true); + _vm->_gfx->setCursorPalette(true); } else if (westIndex >= 0 && (event.mouse.y >= 0 && event.mouse.y <= IDI_MSA_PIC_HEIGHT) && (event.mouse.x >= 20 && event.mouse.x <= 30)) { _vm->_gfx->setCursorPalette(true); @@ -388,7 +387,7 @@ bool Mickey::getMenuSelRow(MSA_MENU menu, int *sel0, int *sel1, int iRow) { (event.mouse.y >= IDI_MSA_PIC_HEIGHT - 10 && event.mouse.y <= IDI_MSA_PIC_HEIGHT)) { *sel0 = goIndex; *sel1 = southIndex; drawMenu(menu, *sel0, *sel1); - _vm->_gfx->setCursorPalette(false); + _vm->_gfx->setCursorPalette(false); clickToMove = true; } else if (westIndex >= 0 && (event.mouse.y >= 0 && event.mouse.y <= IDI_MSA_PIC_HEIGHT) && (event.mouse.x >= 20 && event.mouse.x <= 30)) { @@ -407,7 +406,7 @@ bool Mickey::getMenuSelRow(MSA_MENU menu, int *sel0, int *sel1, int iRow) { } return true; case Common::EVENT_RBUTTONUP: - *sel0 = 0; *sel1 = -1; + *sel0 = 0; *sel1 = -1; return false; case Common::EVENT_WHEELUP: if (iRow < 2) { @@ -555,7 +554,7 @@ void Mickey::patchMenu(MSA_MENU *menu) { // read patches readOfsData( - IDOFS_MSA_MENU_PATCHES, + IDOFS_MSA_MENU_PATCHES, game.nRmMenu[game.iRoom] + game.iRmMenu[game.iRoom] - 1, buffer, sizeof(buffer) ); @@ -753,7 +752,7 @@ void Mickey::drawRoomObjects() { // draw objects if (game.iRmObj[game.iRoom] != IDI_MSA_OBJECT_NONE) { - readOfsData(IDO_MSA_ROOM_OBJECT_XY_OFFSETS, + readOfsData(IDO_MSA_ROOM_OBJECT_XY_OFFSETS, game.iRmObj[game.iRoom], buffer, sizeof(buffer)); nObjs = buffer[pBuf++]; @@ -807,7 +806,7 @@ void Mickey::drawRoomAnimation() { _vm->_picture->drawPicture(); } _vm->_picture->showPic(10, 0, IDI_MSA_PIC_WIDTH, IDI_MSA_PIC_HEIGHT); - + game.nFrame--; if (game.nFrame < 0) game.nFrame = 15; @@ -839,8 +838,8 @@ void Mickey::drawRoomAnimation() { if (game.iRmMenu[game.iRoom] != 2) break; default: drawObj( - IDI_MSA_OBJECT_CRYSTAL, - IDI_MSA_XTAL_ROOM_XY[game.iPlanet][1], + IDI_MSA_OBJECT_CRYSTAL, + IDI_MSA_XTAL_ROOM_XY[game.iPlanet][1], IDI_MSA_XTAL_ROOM_XY[game.iPlanet][2] ); break; @@ -891,7 +890,7 @@ void Mickey::drawLogo() { return; infile.read(buffer, infile.size()); infile.close(); - + // draw logo bitmap memcpy(bitmap, buffer, sizeof(bitmap)); @@ -962,7 +961,7 @@ bool Mickey::loadGame() { } else { infile->read(&game, sizeof(MSA_GAME)); diskerror = false; - delete infile; + delete infile; } } @@ -985,7 +984,7 @@ void Mickey::saveGame() { if (!_vm->waitAnyKeyChoice()) return; - + while (diskerror) { sel = choose1to9(IDO_MSA_SAVE_GAME[3]); if (!sel) @@ -1008,7 +1007,7 @@ void Mickey::saveGame() { } else { outfile->write(&game, sizeof(MSA_GAME)); diskerror = false; - delete outfile; + delete outfile; } } @@ -1027,9 +1026,9 @@ void Mickey::printStory() { char szLine[41] = {0}; int iRow; int pBuf = 0; - + readExe(IDO_MSA_GAME_STORY, (uint8 *)buffer, sizeof(buffer)); - + _vm->clearScreen(IDA_DEFAULT); for (iRow = 0; iRow < 25; iRow++) { strcpy(szLine, buffer + pBuf); @@ -1097,7 +1096,7 @@ void Mickey::pressOB(int iButton) { printExeMsg(IDO_MSA_TOO_MANY_BUTTONS_PRESSED); return; } - + // add button press to address game.nButtons++; game.szAddr[game.nButtons - 1] = (char)iButton; @@ -1180,7 +1179,7 @@ void Mickey::flipSwitch() { game.fHasXtal = false; printExeMsg(IDO_MSA_CRYSTAL_PIECE_FOUND); } - + if (game.nXtals == IDI_MSA_MAX_PLANET) { printExeMsg(IDO_MSA_GAME_OVER[0]); printExeMsg(IDO_MSA_GAME_OVER[1]); @@ -1268,7 +1267,7 @@ void Mickey::randomize() { } game.iPlanetXtal[i] = iPlanet; - + done = false; while (!done) { iHint = _vm->rnd(5); @@ -1308,11 +1307,11 @@ void Mickey::intro() { // draw title picture game.iRoom = IDI_MSA_PIC_TITLE; drawRoom(); - + // show copyright and play theme printExeMsg(IDO_MSA_COPYRIGHT); playSound(IDI_MSA_SND_THEME); - + // load game game.fIntro = true; if (chooseY_N(IDO_MSA_LOAD_GAME[0], true)) { @@ -2050,7 +2049,7 @@ void Mickey::gameLoop() { } else { printRoomDesc(); } - + if (game.iRoom == IDI_MSA_PIC_NEPTUNE_GUARD) { game.iRoom = IDI_MSA_PIC_NEPTUNE_LEADER; done = true; @@ -2164,7 +2163,7 @@ void Mickey::initVars() { // read room object indices readExe(IDO_MSA_ROOM_OBJECT, buffer, sizeof(buffer)); memcpy(game.iRmObj, buffer, sizeof(game.iRmObj)); - + // read room picture indices //readExe(IDO_MSA_ROOM_PICTURE, buffer, sizeof(buffer)); //memcpy(game.iRmPic, buffer, sizeof(game.iRmPic)); diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp index c8cae3b479..034e5c7d7b 100644 --- a/engines/agi/saveload.cpp +++ b/engines/agi/saveload.cpp @@ -28,7 +28,7 @@ * Multi-slots by Claudio Matsuoka <claudio@helllabs.org> */ -#include "common/stdafx.h" + #include "common/file.h" #include "agi/agi.h" @@ -73,7 +73,7 @@ int AgiEngine::saveGame(const char *fileName, const char *description) { out->writeByte(_game.state); debugC(5, kDebugLevelMain | kDebugLevelSavegame, "Writing game state (%d)", _game.state); - + strcpy(gameIDstring, _game.id); out->write(gameIDstring, 8); debugC(5, kDebugLevelMain | kDebugLevelSavegame, "Writing game id (%s, %s)", gameIDstring, _game.id); @@ -104,7 +104,7 @@ int AgiEngine::saveGame(const char *fileName, const char *description) { for (i = 0; i < _HEIGHT; i++) out->writeByte(_game.priTable[i]); - + out->writeSint16BE((int16)_game.gfxMode); out->writeByte(_game.cursorChar); out->writeSint16BE((int16)_game.colorFg); @@ -212,7 +212,7 @@ int AgiEngine::saveGame(const char *fileName, const char *description) { result = errIOError; } else debugC(1, kDebugLevelMain | kDebugLevelSavegame, "Saved game %s in file %s", description, fileName); - + delete out; debugC(3, kDebugLevelMain | kDebugLevelSavegame, "Closed %s", fileName); return result; @@ -239,23 +239,23 @@ int AgiEngine::loadGame(const char *fileName, bool checkId) { debugC(6, kDebugLevelMain | kDebugLevelSavegame, "Has AGI flag, good start"); } else { warning("This doesn't appear to be an AGI savegame, game not restored"); - delete in; + delete in; return errOK; - } + } in->read(description, 31); - + debugC(6, kDebugLevelMain | kDebugLevelSavegame, "Description is: %s", description); - + saveVersion = in->readByte(); if (saveVersion != SAVEGAME_VERSION) warning("Old save game version (%d, current version is %d). Will try and read anyway, but don't be surprised if bad things happen", saveVersion, SAVEGAME_VERSION); _game.state = in->readByte(); - + in->read(loadId, 8); if (strcmp(loadId, _game.id) && checkId) { - delete in; + delete in; warning("This save seems to be from a different AGI game (save from %s, running %s), not loaded", loadId, _game.id); return errBadFileOpen; } @@ -269,7 +269,7 @@ int AgiEngine::loadGame(const char *fileName, bool checkId) { _game.lineStatus = in->readSint16BE(); _game.lineUserInput = in->readSint16BE(); _game.lineMinPrint = in->readSint16BE(); - + /* These are never saved */ _game.cursorPos = 0; _game.inputBuffer[0] = 0; @@ -441,11 +441,11 @@ int AgiEngine::loadGame(const char *fileName, bool checkId) { parm[3], parm[4], parm[5], parm[6]); } - //Load AGIPAL Data + //Load AGIPAL Data if (saveVersion >= 3) _gfx->setAGIPal(in->readSint16BE()); - delete in; + delete in; debugC(3, kDebugLevelMain | kDebugLevelSavegame, "Closed %s", fileName); setflag(fRestoreJustRan, true); @@ -474,7 +474,7 @@ const char *AgiEngine::getSavegameFilename(int num) { void AgiEngine::getSavegameDescription(int num, char *buf, bool showEmpty) { char fileName[MAX_PATH]; Common::InSaveFile *in; - + debugC(4, kDebugLevelMain | kDebugLevelSavegame, "Current game id is %s", _targetName.c_str()); sprintf(fileName, "%s", getSavegameFilename(num)); if (!(in = _saveFileMan->openForLoading(fileName))) { @@ -492,12 +492,12 @@ void AgiEngine::getSavegameDescription(int num, char *buf, bool showEmpty) { } else { warning("This doesn't appear to be an AGI savegame"); strcpy(buf, "(corrupt file)"); - } + } delete in; } } - + int AgiEngine::selectSlot() { int i, key, active = 0; int rc = -1; @@ -516,7 +516,7 @@ int AgiEngine::selectSlot() { buttonX[0] = (textCentre - 3 * buttonLength / 2) * CHAR_COLS; buttonX[1] = (textCentre + buttonLength / 2) * CHAR_COLS; buttonY = (vm + 17) * CHAR_LINES; - + for (i = 0; i < 2; i++) _gfx->drawCurrentStyleButton(buttonX[i], buttonY, buttonText[i], false, false, i == 0); @@ -563,7 +563,7 @@ int AgiEngine::selectSlot() { oldActive = active; oldFirstSlot = _firstSlot; } - + _gfx->pollTimer(); /* msdos driver -> does nothing */ key = doPollKeyboard(); switch (key) { @@ -588,7 +588,7 @@ int AgiEngine::selectSlot() { xmin = (hm + 1) * CHAR_COLS; xmax = xmin + CHAR_COLS * 34; if ((int)g_mouse.x >= xmin && (int)g_mouse.x <= xmax) { - if (slotClicked >= 0 && slotClicked < NUM_VISIBLE_SLOTS) + if (slotClicked >= 0 && slotClicked < NUM_VISIBLE_SLOTS) active = slotClicked; } xmin = (hm + 36) * CHAR_COLS; @@ -630,7 +630,7 @@ int AgiEngine::selectSlot() { } } break; - + // Page Up/Down and mouse wheel scrolling all leave 'active' // unchanged so that a visible slot will remain selected. @@ -686,7 +686,7 @@ int AgiEngine::saveGameDialog() { const char *buttons[] = { "Do as I say!", "I regret", NULL }; char dstr[200]; int rc, slot = 0; - int hm, vm, hp, vp; + int hm, vm, hp, vp; int w; hm = 1; @@ -702,7 +702,7 @@ int AgiEngine::saveGameDialog() { 0, hm + 1, vm + 1, w, MSG_BOX_TEXT, MSG_BOX_COLOUR); slot = selectSlot(); - if (slot < 0) + if (slot < 0) return errOK; drawWindow(hp, vp + 5 * CHAR_LINES, GFX_WIDTH - hp, diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index b76ab309a5..672d88d55b 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/md5.h" #include "common/config-manager.h" @@ -45,13 +45,13 @@ static bool g_useChorus = true; AgiSound *AgiSound::createFromRawResource(uint8 *data, uint32 len, int resnum, SoundMgr &manager) { if (data == NULL || len < 2) return NULL; // Check for too small resource or no resource at all uint16 type = READ_LE_UINT16(data); - + switch (type) { // Create a sound object based on the type case AGI_SOUND_SAMPLE : return new IIgsSample(data, len, resnum, manager); case AGI_SOUND_MIDI : return new IIgsMidi (data, len, resnum, manager); case AGI_SOUND_4CHN : return new PCjrSound (data, len, resnum, manager); } - + warning("Sound resource (%d) has unknown type (0x%04x). Not using the sound", resnum, type); return NULL; } @@ -103,7 +103,7 @@ IIgsSample::IIgsSample(uint8 *data, uint32 len, int resnum, SoundMgr &manager) : warning("Apple IIGS sample (%d) has too high pitch (0x%02x)", resnum, _header.pitch); _header.pitch &= 0x7F; // Apple IIGS AGI probably did it this way too } - + // Finalize the header info using the 8-bit unsigned sample data _header.finalize(stream); @@ -165,7 +165,7 @@ bool IIgsWaveInfo::finalize(Common::SeekableReadStream &uint8Wave) { } } size = trueSize; // Set the true sample size - + uint8Wave.seek(startPos); // Seek back to the stream's starting position return true; } @@ -319,7 +319,7 @@ void SoundMgr::unloadSound(int resnum) { if (_vm->_game.dirSound[resnum].flags & RES_LOADED) { if (_vm->_game.sounds[resnum]->isPlaying()) { _vm->_game.sounds[resnum]->stop(); - } + } // Release the sound resource's data delete _vm->_game.sounds[resnum]; @@ -428,7 +428,7 @@ void SoundMgr::stopSound() { if (_playingSound != -1) { _vm->_game.sounds[_playingSound]->stop(); - + if (_vm->_soundemu == SOUND_EMU_APPLE2GS) { _IIgsChannel.end = true; _IIgsChannel.chanVol = intToFrac(0); @@ -749,7 +749,7 @@ uint32 SoundMgr::mixSound(void) { //double hertz = 8.175798915644 * pow(SEMITONE, fracToDouble(_IIgsChannel.note)); // double step = getRate() / hertz; // _IIgsChannel.posAdd = doubleToFrac(step); - + // Frequency multiplier was 1076.0 based on tests made with MESS 0.117. // Tests made with KEGS32 averaged the multiplier to around 1045. // So this is a guess but maybe it's 1046.5... i.e. C6's frequency? @@ -1003,14 +1003,14 @@ bool SoundMgr::loadInstruments() { debugC(3, kDebugLevelSound, "Platform isn't Apple IIGS so not loading any instruments"); return true; } - + // Get info on the particular Apple IIGS AGI game's executable const IIgsExeInfo *exeInfo = getIIgsExeInfo((enum AgiGameID) _vm->getGameID()); if (exeInfo == NULL) { warning("Unsupported Apple IIGS game, not loading instruments"); return false; } - + // List files in the game path FSList fslist; FilesystemNode dir(ConfMan.get("path")); @@ -1023,7 +1023,7 @@ bool SoundMgr::loadInstruments() { Common::StringList exeNames; exeNames.push_back(Common::String(exeInfo->exePrefix) + ".SYS16"); exeNames.push_back(Common::String(exeInfo->exePrefix) + ".SYS"); - + // Populate wave filenames list (Long filename and short filename) for searching Common::StringList waveNames; waveNames.push_back("SIERRASTANDARD"); diff --git a/engines/agi/view.h b/engines/agi/view.h index f2efce0ec3..f07e3cae41 100644 --- a/engines/agi/view.h +++ b/engines/agi/view.h @@ -26,7 +26,7 @@ #ifndef AGI_VIEW_H #define AGI_VIEW_H -#include "common/stdafx.h" + #include "common/scummsys.h" namespace Agi { diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp index bac4a34454..77dc180f14 100644 --- a/engines/agi/wagparser.cpp +++ b/engines/agi/wagparser.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "common/file.h" #include "common/util.h" @@ -90,7 +88,7 @@ void WagProperty::clear() { setDefaults(); } -void WagProperty::setDefaults() { +void WagProperty::setDefaults() { _readOk = false; _propCode = PC_UNDEFINED; _propType = PT_UNDEFINED; @@ -134,7 +132,7 @@ uint16 WagFileParser::convertToAgiVersionNumber(const WagProperty &version) { // Convert first ascii digit to an integer and put it in the fourth nibble (Bits 12...15) of the version number // and at the same time set all other nibbles to zero. uint16 agiVerNum = ((uint16) (version.getData()[0] - '0')) << (3 * 4); - + // Convert at most three least significant digits of the version number's minor part // (i.e. the part after the decimal point) and put them in order to the third, second // and the first nibble of the version number. Just to clarify version.getSize() - 2 @@ -189,7 +187,7 @@ bool WagFileParser::parse(const char *filename) { // It seems we've got a valid *.wag file so let's parse its properties from the start. stream->seek(0); // Rewind the stream if (!_propList.empty()) _propList.clear(); // Clear out old properties (If any) - + do { // Parse the properties if (property.read(*stream)) { // Read the property and check it was read ok _propList.push_back(property); // Add read property to properties list diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 92c6f952d6..3b5bb3e50b 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/file.h" @@ -187,7 +187,7 @@ AGOSEngine::AGOSEngine(OSystem *syst) _inCallBack = 0; _cepeFlag = 0; _fastMode = 0; - + _backFlag = 0; _debugMode = 0; @@ -336,7 +336,7 @@ AGOSEngine::AGOSEngine(OSystem *syst) _iconToggleCount = 0; _voiceCount = 0; - + _lastTickCount = 0; _thisTickCount = 0; _startSecondCount = 0; diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp index 8d5238259d..fd78c65002 100644 --- a/engines/agos/animation.cpp +++ b/engines/agos/animation.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/events.h" @@ -74,12 +74,12 @@ bool MoviePlayer::load(const char *filename) { char shortName[20]; memset(shortName, 0, sizeof(shortName)); memcpy(shortName, filename, 6); - + sprintf(shortName, "%s~1.dxa", shortName); if (!loadFile(shortName)) error("Failed to load video file %s or %s", videoName, shortName); - + memset(baseName, 0, sizeof(baseName)); memcpy(baseName, shortName, 8); debug(0, "Playing video %s", shortName); diff --git a/engines/agos/charset.cpp b/engines/agos/charset.cpp index 68eb2d7ac8..58ab892308 100644 --- a/engines/agos/charset.cpp +++ b/engines/agos/charset.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" @@ -742,7 +742,7 @@ void AGOSEngine::windowScroll(WindowBlock *window) { } while (--h); _system->unlockScreen(); - } + } colorBlock(window, window->x * 8, (window->height - 1) * 8 + window->y, window->width * 8, 8); diff --git a/engines/agos/contain.cpp b/engines/agos/contain.cpp index 891ac36d30..24a6951b48 100644 --- a/engines/agos/contain.cpp +++ b/engines/agos/contain.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/intern.h" diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp index 9c2cb42988..1755f63f61 100644 --- a/engines/agos/cursor.cpp +++ b/engines/agos/cursor.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/events.h" #include "common/system.h" @@ -69,63 +69,63 @@ static const uint16 _common_swordInfo1[32] = { 0x00FC, 0x0078, 0x01FE, 0x00CC, 0x01CF, 0x0086, 0x0086, 0x0000 }; -static const uint16 _common_swordInfo2[32] = { +static const uint16 _common_swordInfo2[32] = { 0x0000, 0x0000, 0x4000, 0x0000, 0x7000, 0x0000, 0x3800, 0x0000, 0x1C00, 0x0000, 0x0E00, 0x0000, 0x0700, 0x0000, 0x0380, 0x0000, 0x01C0, 0x0000, 0x00E6, 0x0000, 0x007C, 0x0000, 0x0038, 0x0000, 0x0078, 0x0000, 0x00CC, 0x0000, 0x0086, 0x0000, 0x0000, 0x0000, }; -static const uint16 _common_lightningInfo1[32] = { +static const uint16 _common_lightningInfo1[32] = { 0x0000, 0x0000, 0xC000, 0x4000, 0xE000, 0x6000, 0xF020, 0x7000, 0x7860, 0x3820, 0x7CE0, 0x3C60, 0x3FF0, 0x1EF0, 0x3FF0, 0x1FF0, 0x1FF8, 0x0FF8, 0x1FF8, 0x0FF8, 0x0F7C, 0x073C, 0x0E3C, 0x061C, 0x061E, 0x020E, 0x040E, 0x0006, 0x0006, 0x0002, 0x0002, 0x0000, }; -static const uint16 _common_lightningInfo2[32] = { +static const uint16 _common_lightningInfo2[32] = { 0x0000, 0x0000, 0xC000, 0x0000, 0xE000, 0x0000, 0xF020, 0x0000, 0x7860, 0x0000, 0x7CE0, 0x0000, 0x3FF0, 0x0000, 0x3FF0, 0x0000, 0x1FF8, 0x0000, 0x1FF8, 0x0000, 0x0F7C, 0x0000, 0x0E3C, 0x0000, 0x061E, 0x0000, 0x040E, 0x0000, 0x0006, 0x0000, 0x0002, 0x0000, }; -static const uint16 _common_crossbowInfo1[32] = { +static const uint16 _common_crossbowInfo1[32] = { 0x0000, 0x0000, 0x03E0, 0x07C0, 0x1FF8, 0x1FF0, 0x3FFC, 0x3FF8, 0x7FFE, 0x7FFC, 0x7FFE, 0x7FFC, 0xF39E, 0xF39E, 0xE38E, 0xE38E, 0xC386, 0xC386, 0xC386, 0xC386, 0xC386, 0xC386, 0xC386, 0xC386, 0x8002, 0x8002, 0x8002, 0x8002, 0x0000, 0x0000, 0x0000, 0x0000, }; -static const uint16 _common_crossbowInfo2[32] = { +static const uint16 _common_crossbowInfo2[32] = { 0x0000, 0x0000, 0x03E0, 0x0000, 0x1FF8, 0x0000, 0x3FFC, 0x0000, 0x7FFE, 0x0000, 0x7FFE, 0x0000, 0xF39E, 0x0000, 0xE38E, 0x0000, 0xC386, 0x0000, 0xC386, 0x0000, 0xC386, 0x0000, 0xC386, 0x0000, 0x8002, 0x0000, 0x8002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, }; -static const uint16 _common_moveForward[32] = { +static const uint16 _common_moveForward[32] = { 0x0180, 0x0100, 0x03C0, 0x0380, 0x07E0, 0x07C0, 0x0FF0, 0x0FE0, 0x1FF8, 0x1FF0, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; -static const uint16 _common_moveRight[32] = { +static const uint16 _common_moveRight[32] = { 0x00C0, 0x0080, 0x00E0, 0x00C0, 0x00F0, 0x00E0, 0x1FF8, 0x1FF0, 0x3FFC, 0x3FF8, 0x3FF8, 0x3FF0, 0x3CF0, 0x38E0, 0x3CE0, 0x38C0, 0x3CC0, 0x3880, 0x3C00, 0x3800, 0x3C00, 0x3800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; -static const uint16 _common_moveBack[32] = { +static const uint16 _common_moveBack[32] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x1FF8, 0x1FF0, 0x0FF0, 0x0FE0, 0x07E0, 0x07C0, 0x03C0, 0x0380, 0x0180, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; -static const uint16 _common_moveLeft[32] = { +static const uint16 _common_moveLeft[32] = { 0x0C00, 0x0800, 0x1C00, 0x1800, 0x3C00, 0x3800, 0x7FE0, 0x7FC0, 0xFFF0, 0xFFE0, 0x7FF0, 0x7FE0, 0x3CF0, 0x38E0, 0x1CF0, 0x18E0, 0x0CF0, 0x08E0, 0x00F0, 0x00E0, 0x00F0, 0x00E0, 0x0000, 0x0000, @@ -672,7 +672,7 @@ void AGOSEngine_Feeble::drawMousePointer() { if (_animatePointer == 0 && getBitFlag(99)) { _mouseAnim = 1; - cursor = 6; + cursor = 6; } else if (_mouseCursor != 5 && getBitFlag(72)) { cursor += 7; } @@ -693,7 +693,7 @@ void AGOSEngine_Feeble::drawMousePointer() { int hotspotX = 19; int hotspotY = 19; - + if (_mouseCursor == 14) { // Finger pointing away from screen. Not sure where // this is used. diff --git a/engines/agos/debug.cpp b/engines/agos/debug.cpp index c074c3e43f..76a0b8e76f 100644 --- a/engines/agos/debug.cpp +++ b/engines/agos/debug.cpp @@ -24,7 +24,7 @@ */ // AGOS debug functions -#include "common/stdafx.h" + #include "agos/debug.h" #include "agos/agos.h" @@ -109,7 +109,7 @@ const byte *AGOSEngine::dumpOpcode(const byte *p) { printf("[%d] ", n - 60000); else printf("%d ", n); - + } else { if (n >= 30000 && n < 30512) printf("[%d] ", n - 30000); diff --git a/engines/agos/debug.h b/engines/agos/debug.h index 89d43b5212..788c3206cc 100644 --- a/engines/agos/debug.h +++ b/engines/agos/debug.h @@ -26,6 +26,8 @@ #ifndef AGOS_DEBUG_H #define AGOS_DEBUG_H +#include "common/scummsys.h" + namespace AGOS { static const char *const elvira1_opcodeNameTable[300] = { diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp index 3fc5a1f967..470642ec06 100644 --- a/engines/agos/debugger.cpp +++ b/engines/agos/debugger.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index 31ff220412..268b62cab2 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "base/plugins.h" #include "common/advancedDetector.h" @@ -173,10 +171,10 @@ Common::Platform AGOSEngine::getPlatform() const { return _gameDescription->desc.platform; } -const char *AGOSEngine::getFileName(int type) const { +const char *AGOSEngine::getFileName(int type) const { for (int i = 0; _gameDescription->desc.filesDescriptions[i].fileType; i++) { if (_gameDescription->desc.filesDescriptions[i].fileType == type) - return _gameDescription->desc.filesDescriptions[i].fileName; + return _gameDescription->desc.filesDescriptions[i].fileName; } return NULL; } diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp index 68bb152844..c19fad5e4e 100644 --- a/engines/agos/draw.cpp +++ b/engines/agos/draw.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" @@ -53,7 +53,7 @@ void AGOSEngine_Feeble::animateSpritesByY() { VgaSprite *vsp; VgaPointersEntry *vpe; int16 spriteTable[180][2]; - + byte *src; int height, slot, y; uint i, numSprites = 0; @@ -254,7 +254,7 @@ void AGOSEngine::animateSprites() { *dst++ = color; } h--; - } + } _window4Flag = 1; setMoveRect(0, 0, 224, 127); @@ -288,7 +288,7 @@ void AGOSEngine::animateSprites() { } dst += 448; h--; - } + } _window4Flag = 1; setMoveRect(0, 0, 224, 127); @@ -343,7 +343,7 @@ restart: if (_newDirtyClip != 0) goto restart; - + } void AGOSEngine::dirtyClipCheck(int16 x, int16 y, int16 w, int16 h) { @@ -446,7 +446,7 @@ void AGOSEngine::restoreBackGround() { continue; } - _windowNum = animTable->windowNum & 0x7FFF; + _windowNum = animTable->windowNum & 0x7FFF; VC10_state state; state.srcPtr = animTable->srcPtr; @@ -785,7 +785,7 @@ void AGOSEngine::displayScreen() { src += _moveXMin; srcWidth = _videoWindows[18] * 16; - + width = _moveXMax - _moveXMin; height = _moveYMax - _moveYMin; @@ -800,7 +800,7 @@ void AGOSEngine::displayScreen() { _moveXMax = 0; _moveYMax = 0; } - + if (_window6Flag == 2) { _window6Flag = 0; diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp index 5c673de700..ad80b72926 100644 --- a/engines/agos/event.cpp +++ b/engines/agos/event.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/debugger.h" @@ -490,7 +490,7 @@ void AGOSEngine::delay(uint amount) { } else if (event.kbd.keycode == Common::KEYCODE_u) { dumpAllSubroutines(); } - } + } if (getGameType() == GType_PP) { if (event.kbd.flags == Common::KBD_SHIFT) @@ -588,7 +588,7 @@ void AGOSEngine_Feeble::timer_proc1() { } animateSprites(); - } + } if (_displayScreen) { if (getGameType() == GType_FF) { @@ -623,7 +623,7 @@ void AGOSEngine::timer_proc1() { _cepeFlag ^= 1; if (!_cepeFlag) processVgaEvents(); - } + } if (_displayScreen) { displayScreen(); @@ -647,7 +647,7 @@ void AGOSEngine::dimp_idle() { while (z == 0) { n = _rnd.getRandomNumber(2); switch (n) { - case(0): + case(0): if (_variableArray[110] > 2) break; n = _rnd.getRandomNumber(6); diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp index 20ab84d15d..f2b6e06a34 100644 --- a/engines/agos/gfx.cpp +++ b/engines/agos/gfx.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" @@ -181,7 +181,7 @@ bool AGOSEngine::drawImage_clip(VC10_state *state) { if (getGameType() != GType_FF && getGameType() != GType_PP) { state->draw_width = state->width * 2; - } + } cur = state->x; if (cur < 0) { @@ -518,7 +518,7 @@ void AGOSEngine_Simon1::drawMaskedImage(VC10_state *state) { dst[0] = src[0]; if ((mask[0] & 0x0F) && (dst[1] & 0x0F0) == 0x20) dst[1] = src[1]; - } else { + } else { /* no transparency */ if (mask[0] & 0xF0) dst[0] = src[0]; @@ -878,7 +878,7 @@ void AGOSEngine::drawImage(VC10_state *state) { } else { if (_windowNum == 6) { state->surf_addr = _window6BackScn; - state->surf_pitch = 48; + state->surf_pitch = 48; xoffs = state->x * 8; yoffs = state->y; diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp index 3edcedaa8e..f38828f086 100644 --- a/engines/agos/icons.cpp +++ b/engines/agos/icons.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" @@ -379,7 +379,7 @@ void AGOSEngine_Feeble::drawIconArray(uint num, Item *itemRef, int line, int cla line -= 52; if (k == (flagnumber + 18)) k = flagnumber; - } + } yp -= line; // Adjust starting y if (itemRef == NULL) { @@ -428,7 +428,7 @@ l1:; itemRef = derefItem(itemRef->next); } /* Plot arrows and add their boxes */ - addArrows(window, num); + addArrows(window, num); window->iconPtr->upArrow = _scrollUpHitArea; window->iconPtr->downArrow = _scrollDownHitArea; } @@ -530,7 +530,7 @@ void AGOSEngine::drawIconArray(uint num, Item *itemRef, int line, int classMask) if (showArrows != 0 || window->iconPtr->line != 0) { /* Plot arrows and add their boxes */ - addArrows(window, num); + addArrows(window, num); window->iconPtr->upArrow = _scrollUpHitArea; window->iconPtr->downArrow = _scrollDownHitArea; } @@ -856,44 +856,44 @@ void AGOSEngine::addArrows(WindowBlock *window, uint8 num) { } static const byte _arrowImage[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, - 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, - 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, - 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, - 0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x03, - 0x04, 0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, - 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x03, 0x04, - 0x0f, 0x04, 0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, - 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x0d, 0x0d, 0x03, - 0x04, 0x03, 0x0d, 0x0d, 0x0d, 0x0a, 0x0b, 0x0a, - 0x00, 0x0b, 0x0a, 0x0a, 0x0a, 0x0a, 0x09, 0x0d, - 0x03, 0x0d, 0x09, 0x0a, 0x0a, 0x0a, 0x0a, 0x0b, - 0x00, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a, 0x0d, - 0x0d, 0x0d, 0x0a, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, - 0x00, 0x0a, 0x0a, 0x0a, 0x0e, 0x0b, 0x0b, 0x0c, - 0x0e, 0x0c, 0x0b, 0x0b, 0x0e, 0x0a, 0x0a, 0x0a, - 0x00, 0x00, 0x02, 0x02, 0x0a, 0x0b, 0x0a, 0x0d, - 0x0d, 0x0d, 0x0a, 0x0b, 0x0a, 0x02, 0x02, 0x00, - 0x00, 0x00, 0x00, 0x02, 0x0a, 0x0b, 0x0b, 0x0c, - 0x0e, 0x0c, 0x0b, 0x0b, 0x0a, 0x02, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, - 0x0d, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0b, 0x0c, - 0x0e, 0x0c, 0x0b, 0x0b, 0x0a, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0b, 0x0b, - 0x0b, 0x0b, 0x0b, 0x0b, 0x0a, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x0a, 0x0a, - 0x0e, 0x0a, 0x0a, 0x0e, 0x02, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, - 0x0a, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, + 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, + 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, + 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, + 0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x03, + 0x04, 0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, + 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x03, 0x04, + 0x0f, 0x04, 0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, + 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x0d, 0x0d, 0x03, + 0x04, 0x03, 0x0d, 0x0d, 0x0d, 0x0a, 0x0b, 0x0a, + 0x00, 0x0b, 0x0a, 0x0a, 0x0a, 0x0a, 0x09, 0x0d, + 0x03, 0x0d, 0x09, 0x0a, 0x0a, 0x0a, 0x0a, 0x0b, + 0x00, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a, 0x0d, + 0x0d, 0x0d, 0x0a, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, + 0x00, 0x0a, 0x0a, 0x0a, 0x0e, 0x0b, 0x0b, 0x0c, + 0x0e, 0x0c, 0x0b, 0x0b, 0x0e, 0x0a, 0x0a, 0x0a, + 0x00, 0x00, 0x02, 0x02, 0x0a, 0x0b, 0x0a, 0x0d, + 0x0d, 0x0d, 0x0a, 0x0b, 0x0a, 0x02, 0x02, 0x00, + 0x00, 0x00, 0x00, 0x02, 0x0a, 0x0b, 0x0b, 0x0c, + 0x0e, 0x0c, 0x0b, 0x0b, 0x0a, 0x02, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, + 0x0d, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0b, 0x0c, + 0x0e, 0x0c, 0x0b, 0x0b, 0x0a, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0b, 0x0b, + 0x0b, 0x0b, 0x0b, 0x0b, 0x0a, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x0a, 0x0a, + 0x0e, 0x0a, 0x0a, 0x0e, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; void AGOSEngine::drawArrow(uint16 x, uint16 y, int8 dir) { diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp index a86cad9b94..453e2c3562 100644 --- a/engines/agos/input.cpp +++ b/engines/agos/input.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/file.h" @@ -225,15 +225,15 @@ void AGOSEngine::waitForInput() { _dragEnd = 0; continue; } - + _hitAreaSubjectItem = ha->item_ptr; _verbHitArea = 500; - + do { processSpecialKeys(); hitarea_stuff_helper(); delay(100); - + if (_dragFlag == 0) { _dragFlag = 0; _dragMode = 0; @@ -241,19 +241,19 @@ void AGOSEngine::waitForInput() { _dragEnd = 0; } } while (!_dragEnd); - + _dragFlag = 0; _dragMode = 0; _dragCount = 0; _dragEnd = 0; - + boxController(_mouse.x, _mouse.y, 1); - + if (_currentBox != NULL) { _hitAreaObjectItem = _currentBox->item_ptr; setVerbText(ha); } - + break; } @@ -369,7 +369,7 @@ void AGOSEngine::hitarea_stuff_helper() { if (_variableArray[254] || _variableArray[249]) { hitarea_stuff_helper_2(); } - } else if (getGameType() == GType_ELVIRA2 || getGameType() == GType_WW || + } else if (getGameType() == GType_ELVIRA2 || getGameType() == GType_WW || getGameType() == GType_SIMON1) { uint subr_id = (uint16)_variableArray[254]; if (subr_id) { diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp index b5fe745414..3b0ac1d205 100644 --- a/engines/agos/items.cpp +++ b/engines/agos/items.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/file.h" diff --git a/engines/agos/menus.cpp b/engines/agos/menus.cpp index 81df34c311..e6d926b06d 100644 --- a/engines/agos/menus.cpp +++ b/engines/agos/menus.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/file.h" #include "common/system.h" @@ -139,7 +139,7 @@ void AGOSEngine::lightMenuStrip(int a) { } } - mouseOn(); + mouseOn(); } void AGOSEngine::unlightMenuStrip() { @@ -198,7 +198,7 @@ void AGOSEngine::lightMenuBox(uint hitarea) { uint AGOSEngine::menuFor_e2(Item *item) { if (item == NULL || item == _dummyItem2 || item == _dummyItem3) return 0xFFFF; - + SubObject *subObject = (SubObject *)findChildOfType(item, kObjectType); if (subObject != NULL && subObject->objectFlags & kOFMenu) { uint offs = getOffsetOfChild2Param(subObject, kOFMenu); diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp index 13b84c0cda..3114b24549 100644 --- a/engines/agos/midi.cpp +++ b/engines/agos/midi.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/file.h" #include "common/system.h" diff --git a/engines/agos/midiparser_s1d.cpp b/engines/agos/midiparser_s1d.cpp index f5a1d5ff87..342f716c22 100644 --- a/engines/agos/midiparser_s1d.cpp +++ b/engines/agos/midiparser_s1d.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/util.h" diff --git a/engines/agos/oracle.cpp b/engines/agos/oracle.cpp index c7ad0ee8b7..0057fc34a8 100644 --- a/engines/agos/oracle.cpp +++ b/engines/agos/oracle.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/savefile.h" #include "common/system.h" @@ -91,7 +91,7 @@ void AGOSEngine_Feeble::checkUp(WindowBlock *window) { if (!isBoxDead(j + 201)) { uint index = getWindowNum(window); drawIconArray(index, window->iconPtr->itemRef, 0, window->iconPtr->classMask); - animate(4, 9, k + 34, 0, 0, 0); + animate(4, 9, k + 34, 0, 0, 0); } } if ((_variableArray[31] - _variableArray[30]) == 76) { @@ -114,7 +114,7 @@ void AGOSEngine_Feeble::checkUp(WindowBlock *window) { void AGOSEngine_Feeble::inventoryUp(WindowBlock *window) { _marks = 0; checkUp(window); - animate(4, 9, 21, 0 ,0, 0); + animate(4, 9, 21, 0 ,0, 0); while (1) { if (_currentBox->id != 0x7FFB || !getBitFlag(89)) break; @@ -136,7 +136,7 @@ void AGOSEngine_Feeble::checkDown(WindowBlock *window) { uint index = getWindowNum(window); drawIconArray(index, window->iconPtr->itemRef, 0, window->iconPtr->classMask); k = ((_variableArray[31] / 52) % 3); - animate(4, 9, k + 25, 0, 0, 0); + animate(4, 9, k + 25, 0, 0, 0); _variableArray[31] += 52; } if (((_variableArray[31] - _variableArray[30]) == 40) && (_variableArray[30] > 52)) { @@ -157,7 +157,7 @@ void AGOSEngine_Feeble::checkDown(WindowBlock *window) { void AGOSEngine_Feeble::inventoryDown(WindowBlock *window) { _marks = 0; checkDown(window); - animate(4, 9, 23, 0, 0, 0); + animate(4, 9, 23, 0, 0, 0); while (1) { if (_currentBox->id != 0x7FFC || !getBitFlag(89)) break; diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp index 4898cc9a45..ceb041b397 100644 --- a/engines/agos/res.cpp +++ b/engines/agos/res.cpp @@ -24,7 +24,7 @@ */ // Resource file routines for Simon1/Simon2 -#include "common/stdafx.h" + #include "common/file.h" @@ -125,7 +125,7 @@ int AGOSEngine::allocGamePcVars(Common::SeekableReadStream *in) { item_array_size += 2; item_array_inited = item_array_size; } else { - item_array_inited += 2; + item_array_inited += 2; item_array_size += 2; } @@ -395,7 +395,7 @@ void AGOSEngine::readItemChildren(Common::SeekableReadStream *in, Item *item, ui setUserFlag(item, 6, in->readUint16BE()); setUserFlag(item, 7, in->readUint16BE()); SubUserFlag *subUserFlag = (SubUserFlag *)findChildOfType(item, kUserFlagType); - subUserFlag->userItems[0] = (uint16)fileReadItemID(in); + subUserFlag->userItems[0] = (uint16)fileReadItemID(in); fileReadItemID(in); fileReadItemID(in); fileReadItemID(in); @@ -658,7 +658,7 @@ void AGOSEngine::loadVGABeardFile(uint16 id) { if (getPlatform() == Common::kPlatformAmiga) { if (getFeatures() & GF_TALKIE) sprintf(filename, "0%d.out", id); - else + else sprintf(filename, "0%d.pkd", id); } else { sprintf(filename, "0%d.VGA", id); diff --git a/engines/agos/res_ami.cpp b/engines/agos/res_ami.cpp index e298cf66e9..a40ca54c58 100644 --- a/engines/agos/res_ami.cpp +++ b/engines/agos/res_ami.cpp @@ -24,7 +24,7 @@ */ // Conversion routines for planar graphics in Amiga versions -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/intern.h" diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp index beea0de473..738de98342 100644 --- a/engines/agos/res_snd.cpp +++ b/engines/agos/res_snd.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/file.h" @@ -308,7 +308,7 @@ void AGOSEngine::playMusic(uint16 music, uint16 track) { void AGOSEngine::stopMusic() { if (_midiEnabled) { _midi.stop(); - } + } _mixer->stopHandle(_modHandle); } diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp index 5e612080df..e1e6b11d0e 100644 --- a/engines/agos/rooms.cpp +++ b/engines/agos/rooms.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/intern.h" @@ -119,10 +119,10 @@ void AGOSEngine::setDoorState(Item *i, uint16 d, uint16 n) { y++; } /* Check are a complete exit pair */ - if (derefItem(r1->roomExit[d1]) != i) + if (derefItem(r1->roomExit[d1]) != i) return; /* Change state of exit coming back */ - changeDoorState(r1, d, n); + changeDoorState(r1, d, n); } // Elvira 1 specific @@ -265,13 +265,13 @@ int AGOSEngine_Elvira2::changeExitStates(SubSuperRoom *sr, int n, int d, uint16 return(0); else break; - case 1: + case 1: b = 1; bd = 3; if (((n % (sr->roomX * sr->roomY)) % sr->roomX) == 0) return 0; else break; - case 2: + case 2: b = sr->roomX; bd = 0; if (((n % (sr->roomX * sr->roomY)) / sr->roomX) == (sr->roomY - 1)) return 0; diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index da1aa92008..b399e58688 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/savefile.h" #include "common/system.h" @@ -55,12 +55,12 @@ int AGOSEngine::countSaveGames() { slot[0] = file->c_str()[file->size()-3]; slot[1] = file->c_str()[file->size()-2]; slot[2] = file->c_str()[file->size()-1]; - + slotNum = atoi(slot); if (slotNum >= 0 && slotNum < 256) marks[slotNum] = true; //mark this slot as valid } - + while (i < 256) { if (marks[i] && (f = _saveFileMan->openForLoading(genSaveName(i)))) { @@ -69,7 +69,7 @@ int AGOSEngine::countSaveGames() { } else break; } - + return i; } @@ -242,7 +242,7 @@ void AGOSEngine::userGame(bool load) { char buf[8]; numSaveGames = countSaveGames(); - + time_t saveTime = time(NULL); haltAnimation(); diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp index ace0b9d50f..33ef3141ce 100644 --- a/engines/agos/script.cpp +++ b/engines/agos/script.cpp @@ -25,7 +25,7 @@ // Item script opcodes for Simon1/Simon2 -#include "common/stdafx.h" + #include "common/system.h" @@ -805,7 +805,7 @@ void AGOSEngine::o_freezeZones() { _variableArray[135] = 3; setBitFlag(135, 1); setScriptCondition(0); - } + } } } diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp index 5a1d7d104b..c3f7c841dc 100644 --- a/engines/agos/script_e1.cpp +++ b/engines/agos/script_e1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/vga.h" @@ -505,7 +505,7 @@ void AGOSEngine_Elvira1::oe1_copyfo() { void AGOSEngine_Elvira1::oe1_whatO() { // 57: what o - int a = getVarOrWord(); + int a = getVarOrWord(); if (a == 1) _subjectItem = findMaster(_scriptAdj1,_scriptNoun1); @@ -896,7 +896,7 @@ void AGOSEngine_Elvira1::oe1_pauseGame() { // 274: pause game WindowBlock *window = _windowArray[4]; const char *message1, *message2; - + time_t pauseTime = time(NULL); haltAnimation(); @@ -933,7 +933,7 @@ restart: window->textRow = 0; window->textColumnOffset = 0; window->textLength = 0; // Difference - + switch (_language) { case Common::FR_FRA: message1 = " Etes-vous s<r ?\r\r\r"; @@ -1163,7 +1163,7 @@ void AGOSEngine::printStats() { if (val < -99) val = -99; if (val > 99) - val = 99; + val = 99; writeChar(window, 5, 133, 6, val); // Resolution @@ -1171,7 +1171,7 @@ void AGOSEngine::printStats() { if (val < -99) val = -99; if (val > 99) - val = 99; + val = 99; writeChar(window, 11, 133, 6, val); // Dexterity @@ -1179,7 +1179,7 @@ void AGOSEngine::printStats() { if (val < -99) val = -99; if (val > 99) - val = 99; + val = 99; writeChar(window, 18, 133, 0, val); // Skill @@ -1187,7 +1187,7 @@ void AGOSEngine::printStats() { if (val < -99) val = -99; if (val > 99) - val = 99; + val = 99; writeChar(window, 24, 133, 0, val); // Life @@ -1195,7 +1195,7 @@ void AGOSEngine::printStats() { if (val < -99) val = -99; if (val > 99) - val = 99; + val = 99; writeChar(window, 30, 133, 2, val); // Experience @@ -1203,7 +1203,7 @@ void AGOSEngine::printStats() { if (val < -99) val = -99; if (val > 99) - val = 99; + val = 99; writeChar(window, 36, 133, 4, val); mouseOn(); diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp index 77df3feecb..53f9833b06 100644 --- a/engines/agos/script_e2.cpp +++ b/engines/agos/script_e2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agos/agos.h" @@ -703,7 +703,7 @@ void AGOSEngine_Elvira2::printStats() { if (val < -99) val = -99; if (val > 99) - val = 99; + val = 99; writeChar(window, 10, y, 0, val); // PP @@ -711,7 +711,7 @@ void AGOSEngine_Elvira2::printStats() { if (val < -99) val = -99; if (val > 99) - val = 99; + val = 99; writeChar(window, 16, y, 6, val); // HP @@ -719,7 +719,7 @@ void AGOSEngine_Elvira2::printStats() { if (val < -99) val = -99; if (val > 99) - val = 99; + val = 99; writeChar(window, 23, y, 4, val); // Experience @@ -727,7 +727,7 @@ void AGOSEngine_Elvira2::printStats() { if (val < -99) val = -99; if (val > 9999) - val = 9999; + val = 9999; writeChar(window, 30, y, 6, val / 100); writeChar(window, 32, y, 2, val % 100); diff --git a/engines/agos/script_ff.cpp b/engines/agos/script_ff.cpp index 8b7af31a66..89c760b8bf 100644 --- a/engines/agos/script_ff.cpp +++ b/engines/agos/script_ff.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" diff --git a/engines/agos/script_pp.cpp b/engines/agos/script_pp.cpp index a7bda53e48..7413934d5c 100644 --- a/engines/agos/script_pp.cpp +++ b/engines/agos/script_pp.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp index 1a4f956b8b..a1308b951d 100644 --- a/engines/agos/script_s1.cpp +++ b/engines/agos/script_s1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" @@ -368,7 +368,7 @@ void AGOSEngine_Simon1::os1_screenTextBox() { tl->y = getVarOrByte(); tl->width = getVarOrWord(); } - + void AGOSEngine_Simon1::os1_screenTextMsg() { // 162: print string uint vgaSpriteId = getVarOrByte(); diff --git a/engines/agos/script_s2.cpp b/engines/agos/script_s2.cpp index 00addce396..d868e1e5bd 100644 --- a/engines/agos/script_s2.cpp +++ b/engines/agos/script_s2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agos/agos.h" diff --git a/engines/agos/script_ww.cpp b/engines/agos/script_ww.cpp index fc472fd3c3..94c6152315 100644 --- a/engines/agos/script_ww.cpp +++ b/engines/agos/script_ww.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index a735f54c29..e198fe8d66 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/file.h" #include "common/util.h" @@ -739,7 +739,7 @@ void Sound::playSoundData(Audio::SoundHandle *handle, byte *soundData, uint soun if (loop == true) flags |= Audio::Mixer::FLAG_LOOP; - + if (compType == 2) { Audio::AudioStream *sndStream = Audio::makeADPCMStream(&stream, size, Audio::kADPCMMS, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign); buffer = (byte *)malloc(size * 4); diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp index 521a3ab6ea..6714659449 100644 --- a/engines/agos/string.cpp +++ b/engines/agos/string.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/intern.h" @@ -482,14 +482,14 @@ void AGOSEngine_Feeble::printInteractText(uint16 num, const char *string) { } // ScrollX - x = _variableArray[251]; + x = _variableArray[251]; x += 20; if (num == 1) _interactY = 385; // Returned values for box definition - _variableArray[51] = x; + _variableArray[51] = x; _variableArray[52] = _interactY; _variableArray[53] = w; _variableArray[54] = height; diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp index f4a6ba3266..823e87ccb9 100644 --- a/engines/agos/subroutine.cpp +++ b/engines/agos/subroutine.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/intern.h" diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp index f99d6db591..1f542729f2 100644 --- a/engines/agos/verb.cpp +++ b/engines/agos/verb.cpp @@ -24,7 +24,7 @@ */ // Verb and hitarea handling -#include "common/stdafx.h" + #include "common/system.h" @@ -239,7 +239,7 @@ void AGOSEngine::printVerbOf(uint hitarea_id) { verb_prep_names = spanish_verb_prep_names; break; case Common::IT_ITA: - verb_prep_names = italian_verb_prep_names; + verb_prep_names = italian_verb_prep_names; break; case Common::FR_FRA: verb_prep_names = french_verb_prep_names; @@ -247,7 +247,7 @@ void AGOSEngine::printVerbOf(uint hitarea_id) { case Common::DE_DEU: verb_prep_names = german_verb_prep_names; break; - default: + default: verb_prep_names = english_verb_prep_names; break; } @@ -273,7 +273,7 @@ void AGOSEngine::printVerbOf(uint hitarea_id) { case Common::DE_DEU: verb_names = german_verb_names; break; - default: + default: verb_names = english_verb_names; break; } @@ -717,7 +717,7 @@ void AGOSEngine::boxController(uint x, uint y, uint mode) { } } } - + if ((getGameType() == GType_WW) && (_mouseCursor == 0 || _mouseCursor >= 4)) { uint verb = best_ha->verb & 0x3FFF; if (verb >= 239 && verb <= 242) { diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp index 38c401a80d..e5a01572cf 100644 --- a/engines/agos/vga.cpp +++ b/engines/agos/vga.cpp @@ -24,7 +24,7 @@ */ // Video script opcodes for Simon1/Simon2 -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/intern.h" diff --git a/engines/agos/vga_e2.cpp b/engines/agos/vga_e2.cpp index a4925de842..8e046f34aa 100644 --- a/engines/agos/vga_e2.cpp +++ b/engines/agos/vga_e2.cpp @@ -24,7 +24,7 @@ */ // Video script opcodes for Simon1/Simon2 -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/intern.h" diff --git a/engines/agos/vga_ff.cpp b/engines/agos/vga_ff.cpp index 29b05e1e3c..e50fada828 100644 --- a/engines/agos/vga_ff.cpp +++ b/engines/agos/vga_ff.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/intern.h" @@ -50,7 +50,7 @@ int AGOSEngine::getScale(int16 y, int16 x) { if (y > _baseY) { return((int16)(x * (1 + ((y - _baseY) * _scale)))); - } else { + } else { if (x == 0) return(0); if (x < 0) { @@ -122,7 +122,7 @@ void AGOSEngine::vc77_setScaleYOffs() { vsp->y += getScale(vsp->y, y); _variableArrayPtr[var] = vsp->y; - if (y != 0) + if (y != 0) checkScrollY(y, vsp->y); vsp->flags = kDFScaled; @@ -337,7 +337,7 @@ void AGOSEngine::startOverlayAnims() { int i; zoneNum = _variableArray[999]; - + for (i = 0; i < 600; i++) { if (_variableArray[1000 + i] < 100) continue; diff --git a/engines/agos/vga_s1.cpp b/engines/agos/vga_s1.cpp index 95e8e0a8b5..f99c8afb83 100644 --- a/engines/agos/vga_s1.cpp +++ b/engines/agos/vga_s1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/intern.h" @@ -162,7 +162,7 @@ void AGOSEngine::vc48_setPathFinder() { x = vsp->x & 7; ydiff *= x; ydiff /= 8; - ydiff = -ydiff; + ydiff = -ydiff; } else { x = vsp->x & 7; ydiff *= x; diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp index 9c05bc1100..82f0811811 100644 --- a/engines/agos/vga_s2.cpp +++ b/engines/agos/vga_s2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/intern.h" diff --git a/engines/agos/vga_ww.cpp b/engines/agos/vga_ww.cpp index c24a115e71..b236fa26a0 100644 --- a/engines/agos/vga_ww.cpp +++ b/engines/agos/vga_ww.cpp @@ -24,7 +24,7 @@ */ // Video script opcodes for Simon1/Simon2 -#include "common/stdafx.h" + #include "agos/agos.h" #include "agos/intern.h" diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp index d4eb7ba3fc..a9331bbc40 100644 --- a/engines/agos/window.cpp +++ b/engines/agos/window.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" @@ -216,7 +216,7 @@ void AGOSEngine::restoreWindow(WindowBlock *window) { w++; } } - + restoreBlock(window->y + window->height * 8, (x + w) * 8, window->y, x * 8); } @@ -287,7 +287,7 @@ void AGOSEngine::waitWindow(WindowBlock *window) { windowPutChar(window, *message); ha = findEmptyHitArea(); - ha->x = (window->width / 2 + window->x - 3) * 8; + ha->x = (window->width / 2 + window->x - 3) * 8; ha->y = window->height * 8 + window->y - 8; ha->width = 48; ha->height = 8; diff --git a/engines/agos/zones.cpp b/engines/agos/zones.cpp index d40e1da1de..e754baec10 100644 --- a/engines/agos/zones.cpp +++ b/engines/agos/zones.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/file.h" diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp index 12d8f70cd0..86d3e2a2a3 100644 --- a/engines/cine/anim.cpp +++ b/engines/cine/anim.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/stream.h" diff --git a/engines/cine/bg.cpp b/engines/cine/bg.cpp index 32b59e0554..4f7267eb51 100644 --- a/engines/cine/bg.cpp +++ b/engines/cine/bg.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/stream.h" diff --git a/engines/cine/bg_list.cpp b/engines/cine/bg_list.cpp index c6d85e5909..84fb8db133 100644 --- a/engines/cine/bg_list.cpp +++ b/engines/cine/bg_list.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/stream.h" @@ -112,7 +112,7 @@ void createBgIncrustListElement(int16 objIdx, int16 param) { void freeBgIncrustList(void) { BGIncrustList *bgIncrustPtr = bgIncrustList; BGIncrustList *bgIncrustPtrN; - + while (bgIncrustPtr) { bgIncrustPtrN = bgIncrustPtr->next; free(bgIncrustPtr); @@ -136,7 +136,7 @@ void loadBgIncrustFromSave(Common::InSaveFile *fHandle) { bgIncrustPtrP = bgIncrustPtr; bgIncrustPtr = bgIncrustPtr->next; } - + bgIncrustPtr = (BGIncrustList *)malloc(sizeof(BGIncrustList)); if (bgIncrustPtrP) bgIncrustPtrP->next = bgIncrustPtr; @@ -173,7 +173,7 @@ void reincrustAllBg(void) { } bgIncrustPtr = bgIncrustPtr->next; - } + } } } // End of namespace Cine diff --git a/engines/cine/bg_list.h b/engines/cine/bg_list.h index 3abbf15c08..a4b8b44a4c 100644 --- a/engines/cine/bg_list.h +++ b/engines/cine/bg_list.h @@ -26,7 +26,7 @@ #ifndef CINE_BGLIST_H #define CINE_BGLIST_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/savefile.h" diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp index bd5b82fec2..31c092987b 100644 --- a/engines/cine/cine.cpp +++ b/engines/cine/cine.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/file.h" #include "common/savefile.h" #include "common/config-manager.h" @@ -120,7 +120,7 @@ void CineEngine::initialize() { partBuffer = (PartBuffer *)malloc(NUM_MAX_PARTDATA * sizeof(PartBuffer)); animDataTable = (AnimData *)malloc(NUM_MAX_ANIMDATA * sizeof(AnimData)); - + loadTextData("texte.dat", textDataPtr); if (g_cine->getGameType() == Cine::GType_OS && !(g_cine->getFeatures() & GF_DEMO)) { @@ -190,7 +190,7 @@ void CineEngine::initialize() { if (res) _preLoad = true; } - + if (!_preLoad) { loadPrc(BOOT_PRC_NAME); strcpy(currentPrcName, BOOT_PRC_NAME); diff --git a/engines/cine/cine.h b/engines/cine/cine.h index eef54bb737..209fb926ea 100644 --- a/engines/cine/cine.h +++ b/engines/cine/cine.h @@ -26,7 +26,7 @@ #ifndef CINE_H #define CINE_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/file.h" #include "common/util.h" @@ -67,7 +67,7 @@ protected: int init(); int go(); void shutdown(); - + bool initGame(); public: diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 690644a0fa..f4b9b0c94e 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "base/plugins.h" diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp index 89a0f3e6fc..f52c669abc 100644 --- a/engines/cine/main_loop.cpp +++ b/engines/cine/main_loop.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/events.h" #include "common/system.h" @@ -150,7 +150,7 @@ void manageEvents(int count) { for (i = 0; i < count; i++) { //FIXME(?): Maybe there's a better way to "fix" this? // - //Since not all backends/ports can update the screen + //Since not all backends/ports can update the screen //100 times per second, only update the screen every //other frame (1000 / 2 * 10 i.e. 50 times per second max.) if (i % 2) diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp index 3f5f33fc40..212b9ffd7c 100644 --- a/engines/cine/msg.cpp +++ b/engines/cine/msg.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "cine/msg.h" diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp index cab8d98977..a549abff89 100644 --- a/engines/cine/object.cpp +++ b/engines/cine/object.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/scummsys.h" #include "common/util.h" diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp index 685f5780d0..4081d6fd5a 100644 --- a/engines/cine/prc.cpp +++ b/engines/cine/prc.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "cine/cine.h" @@ -95,7 +95,7 @@ void loadPrc(const char *pPrcName) { setMouseCursor(MOUSE_CURSOR_DISK); - numScripts = READ_BE_UINT16(scriptPtr); + numScripts = READ_BE_UINT16(scriptPtr); scriptPtr += 2; assert(numScripts <= NUM_MAX_SCRIPT); diff --git a/engines/cine/rel.cpp b/engines/cine/rel.cpp index 03ab5e44b2..2fed7c2ff3 100644 --- a/engines/cine/rel.cpp +++ b/engines/cine/rel.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "cine/cine.h" @@ -96,7 +96,7 @@ void loadRel(char *pRelName) { ptr += relTable[i].size; } } - + free(dataPtr); #ifdef DUMP_SCRIPTS diff --git a/engines/cine/script.cpp b/engines/cine/script.cpp index ca8eebe35d..3b469eda60 100644 --- a/engines/cine/script.cpp +++ b/engines/cine/script.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "cine/cine.h" @@ -1475,7 +1475,7 @@ void o1_setZoneDataEntry() { void o1_getZoneDataEntry() { byte zoneIdx = getNextByte(); byte var = getNextByte(); - + _currentScriptElement->localVars[var] = zoneData[zoneIdx]; } @@ -1574,7 +1574,7 @@ void o1_playSample() { channel2 = 1; } else { channel1 = 2; - channel2 = 3; + channel2 = 3; } g_sound->playSound(channel1, freq, animDataTable[anim].ptr1, size, -1, volume, 63, repeat); g_sound->playSound(channel2, freq, animDataTable[anim].ptr1, size, 1, volume, 0, repeat); diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp index 4ba083a653..73add512e8 100644 --- a/engines/cine/sound.cpp +++ b/engines/cine/sound.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "common/file.h" #include "common/system.h" diff --git a/engines/cine/texte.h b/engines/cine/texte.h index 801220cdf0..e2afec41dc 100644 --- a/engines/cine/texte.h +++ b/engines/cine/texte.h @@ -26,7 +26,7 @@ #ifndef CINE_TEXTE_H #define CINE_TEXTE_H -#include "common/stdafx.h" + #include "common/scummsys.h" namespace Cine { diff --git a/engines/cine/unpack.cpp b/engines/cine/unpack.cpp index 2c45566dec..254b09313e 100644 --- a/engines/cine/unpack.cpp +++ b/engines/cine/unpack.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "cine/unpack.h" @@ -35,7 +35,7 @@ struct UnpackCtx { uint32 crc; uint32 chk; byte *dst; - const byte *src; + const byte *src; }; static int rcr(UnpackCtx *uc, int CF) { @@ -63,7 +63,7 @@ static uint16 getCode(UnpackCtx *uc, byte numChunks) { c <<= 1; if (nextChunk(uc)) { c |= 1; - } + } } return c; } diff --git a/engines/cine/unpack.h b/engines/cine/unpack.h index 23e2cad4b3..5f57a3531b 100644 --- a/engines/cine/unpack.h +++ b/engines/cine/unpack.h @@ -26,7 +26,7 @@ #ifndef CINE_UNPACK_H #define CINE_UNPACK_H -#include "common/stdafx.h" + #include "common/scummsys.h" namespace Cine { diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp index 49b10b6b14..e8b59266db 100644 --- a/engines/cine/various.cpp +++ b/engines/cine/various.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/events.h" #include "common/savefile.h" @@ -1006,7 +1006,7 @@ void CineEngine::makeSystemMenu(void) { warning("Unable to open file %s for saving", tmp); break; } - + fHandle->write(currentSaveName, 200); delete fHandle; @@ -2187,18 +2187,18 @@ void drawSprite(overlayHeadElement *currentOverlay, byte *spritePtr, int16 maskWidth; int16 maskHeight; uint16 maskSpriteIdx; - + if (!si) { ptr = (byte *)malloc(width * 8 * height); msk = (byte *)malloc(width * 8 * height); si = 1; } - + maskX = objectTable[pCurrentOverlay->objIdx].x; maskY = objectTable[pCurrentOverlay->objIdx].y; - + maskSpriteIdx = objectTable[pCurrentOverlay->objIdx].frame; - + maskWidth = animDataTable[maskSpriteIdx].width / 2; maskHeight = animDataTable[maskSpriteIdx].height; gfxSpriteFunc2(spritePtr, maskPtr, width, height, animDataTable[maskSpriteIdx].ptr1, maskWidth, maskHeight, ptr, msk, x, y, maskX, maskY, i++); @@ -2206,10 +2206,10 @@ void drawSprite(overlayHeadElement *currentOverlay, byte *spritePtr, gfxFillSprite(animDataTable[maskSpriteIdx].ptr1, maskWidth, maskHeight, page, maskX, maskY, 1); #endif } - + pCurrentOverlay = pCurrentOverlay->next; - } - + } + if (si) { gfxSpriteFunc1(ptr, msk, width, height, page, x, y); free(ptr); @@ -2366,7 +2366,7 @@ void drawFailureMessage(byte cmd) { if (width > 300) width = 300; - + int16 x = (320 - width) / 2; int16 y = 80; int16 color = 4; @@ -3061,10 +3061,10 @@ bool makeTextEntryMenu(const char *messagePtr, char *inputString, int stringMaxL if (width > 250) width = 250; - + if (width < 180) width = 180; - + int16 x = (320 - width) / 2; int16 color = 2; @@ -3267,7 +3267,7 @@ bool makeTextEntryMenu(const char *messagePtr, char *inputString, int stringMaxL if ((inputLength != 0) && (inputPos != inputLength)) { strncat(tempString, &inputString[inputPos - 1], inputLength - inputPos + 1); } - + strcpy(inputString, tempString); inputLength = strlen(inputString); inputPos++; diff --git a/engines/cine/various.h b/engines/cine/various.h index 31d8cfdc84..654ba68042 100644 --- a/engines/cine/various.h +++ b/engines/cine/various.h @@ -26,7 +26,7 @@ #ifndef CINE_VARIOUS_H #define CINE_VARIOUS_H -#include "common/stdafx.h" + #include "common/file.h" #include "cine/cine.h" @@ -41,7 +41,7 @@ void makeCommandLine(void); void makeActionMenu(void); extern bool disableSystemMenu; -extern bool inMenu; +extern bool inMenu; struct unk1Struct { byte *ptr; diff --git a/engines/cruise/cell.h b/engines/cruise/cell.h index c10ab93541..ba6a240d0e 100644 --- a/engines/cruise/cell.h +++ b/engines/cruise/cell.h @@ -26,7 +26,7 @@ #ifndef CRUISE_CELL_H #define CRUISE_CELL_H -#include "common/stdafx.h" + #include "common/scummsys.h" namespace Cruise { diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp index 9693fb7d03..4358ac0e17 100644 --- a/engines/cruise/cruise.cpp +++ b/engines/cruise/cruise.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/file.h" #include "common/savefile.h" #include "common/config-manager.h" diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h index 73de46c599..515238d264 100644 --- a/engines/cruise/cruise.h +++ b/engines/cruise/cruise.h @@ -26,7 +26,6 @@ #ifndef CRUISE_CRUISE_H #define CRUISE_CRUISE_H -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/util.h" diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index 3558b4f18a..1a89b5671e 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/events.h" @@ -361,7 +361,7 @@ int loadFileSub1(uint8 **ptr, uint8 *name, uint8 *ptr2) { * strcatuint8(buffer,".ADL"); * } * else - * { + * { * strcatuint8(buffer,".HP"); * } */ } else { @@ -1255,7 +1255,7 @@ void manageEvents(int count) { * if (!disableSystemMenu && !inMenu) { * g_cine->makeSystemMenu(); * } - * break; + * break; * default: * //lastKeyStroke = event.kbd.keycode; * break; @@ -1278,7 +1278,7 @@ void manageEvents(int count) { for (i = 0; i < count; i++) { //FIXME(?): Maybe there's a better way to "fix" this? // - //Since not all backends/ports can update the screen + //Since not all backends/ports can update the screen //100 times per second, only update the screen every //other frame (1000 / 2 * 10 i.e. 50 times per second max.) if (i % 2) @@ -1346,7 +1346,7 @@ void mainLoop(void) { /* main3 = 0; * var24 = 0; * var23 = 0; - * + * * freeStuff2(); */ } @@ -1374,18 +1374,18 @@ void mainLoop(void) { /* if (userEnabled && !main7 && !main15 && currentActiveMenu == -1) * { * getMouseStatus(&main10, &mouseX, &mouseButton, &mouseY); - * + * * if (mouseX != oldMouseX && mouseY != oldMouseY) * { * int cursorType; * int newCursor1; * int newCursor2; - * + * * oldMouseX = mouseX; * oldMouseY = mouseY; - * + * * cursorType = getCursorFromObject(mouseX, mouseY, &newCursor1, &newCursor2); - * + * * if (cursorType == 9) * { * changeCursor(5); @@ -1399,8 +1399,8 @@ void mainLoop(void) { * { * changeCursor(4); * } - * - * } + * + * } * } * else */ { diff --git a/engines/cruise/cruise_main.h b/engines/cruise/cruise_main.h index c42650a007..b5603ab740 100644 --- a/engines/cruise/cruise_main.h +++ b/engines/cruise/cruise_main.h @@ -30,7 +30,7 @@ #include <stdlib.h> #include <assert.h> -#include "common/stdafx.h" + #include "common/scummsys.h" #include "cruise/overlay.h" diff --git a/engines/cruise/delphine-unpack.cpp b/engines/cruise/delphine-unpack.cpp index b1cdc13148..7dfed6fea9 100644 --- a/engines/cruise/delphine-unpack.cpp +++ b/engines/cruise/delphine-unpack.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" namespace Cruise { @@ -33,7 +33,7 @@ struct UnpackCtx { uint32 crc; uint32 chk; byte *dst; - const byte *src; + const byte *src; }; static int rcr(UnpackCtx *uc, int CF) { @@ -61,7 +61,7 @@ static uint16 getCode(UnpackCtx *uc, byte numChunks) { c <<= 1; if (nextChunk(uc)) { c |= 1; - } + } } return c; } diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index 2ca83f4046..8307a483ad 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "base/plugins.h" diff --git a/engines/cruise/gfxModule.cpp b/engines/cruise/gfxModule.cpp index b106db558d..638aa2adbe 100644 --- a/engines/cruise/gfxModule.cpp +++ b/engines/cruise/gfxModule.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "cruise/cruise_main.h" @@ -78,7 +78,7 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * int loc_1277; * int loc_12D9; * int loc_12DD; - * + * * int loc_11E7; * int loc_127A; * int loc_1203; @@ -87,16 +87,16 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * int loc_11EF; * int loc_1217; * int loc_12E1; - * + * * int tempSwap; - * + * * int cx; * int bp; * int bpSave; - * + * * char* diPtr; * char* siPtr; - * + * * int direction = 1; * int dx = height; * int ax = width; @@ -104,13 +104,13 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * int bx = 0; * int di = 199; * int si; - * + * * ax = y; * si = 0; - * + * * if (y>199) // out of screen vertically * return; - * + * * if (y<0) // cropped on the top * { * cx = bx; @@ -125,30 +125,30 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * si+=ax; * ax = cx; * } - * + * * bx = ax; * ax += dx; * ax--; - * + * * if (ax > di) * { * ax -= di; * dx -= ax; - * + * * if (dx <= 0) * { * return; * } * } - * + * * ax = dx; * loc_10DF = ax; * ax = bx; * loc_10AD = ax; - * + * * bx = 0; * di = 319; - * + * * ax = x; * dx = ax; * cx = ax&0xFF; @@ -156,7 +156,7 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * { * int cl = cx; * int ch = cl; - * + * * cl-=8; * cl=-cl; * cl&=7; @@ -165,29 +165,29 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * loc_1064 = ax; * ax = es; * ax <<= 3; - * + * * tempSwap = dx; * dx = ax; * ax = tempSwap; - * + * * if (ax > di) * { * return; * } - * + * * cx = ax; * cx += dx; * cx --; - * + * * dx >>= 3; - * + * * dx = dx&0xFF; - * + * * if (cx<bx) * { * return; * } - * + * * if (cx>di) * { * cx -= di; @@ -200,13 +200,13 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * { * di = 0xF8F8; * } - * + * * if (ax<bx) * { * ax -= bx; * ax = -ax; * ax >>= 3; - * + * * si += ax; * dx = (dx&0xFF00) | (((dx&0xFF)-(ax&0xFF))&0xFF); * dx = (((dx&0xFF00) + ((ax&0xFF)<<8))&0xFF00) | (dx&0xFF); @@ -215,31 +215,31 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * cx = (248<<8)|(cx&0xFF); * di = cx; * } - * + * * loc_10AA = ax; * ax = (ax&0xFF00) | (((dx&0xFF00)>>8)&0xFF); * ax = ax&0xFF; * loc_10C5 = ax; * ax = (ax&0xFF00) | (dx&0xFF); - * + * * dx = loc_1064; - * + * * if (dx) * { * if (di&1) * { * loc_10C5++; * } - * + * * bx = ax; * ax--; * loc_11DC = ax; - * + * * if (di&0x100) * { * bx--; * } - * + * * ax = bx; * ax -= 40; * ax = -ax; @@ -256,19 +256,19 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * ax = -ax; * loc_1147 = ax; * } - * + * * bx = loc_10AA; * ax = loc_10AD; * bx = ((((((bx&0xFF00)>>8)&0xFF) + (ax&0xFF))<<8)&0xFF00) | (bx&0xFF); - * + * * bx>>=3; * ax<<=3; - * + * * bx+=ax; - * + * * diPtr = destPtr; * diPtr += bx; - * + * * ax = loc_10C5; * ax<<=2; * loc_114B = ax; @@ -276,31 +276,31 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * ax = si; * ax <<=2; * siPtr = sourcePtr; - * + * * siPtr+=ax; - * + * * bp = loc_10DF; * bx = dx; * dx = 974; - * + * * if (!bx) // no crop ? * { * do // for each line * { * bpSave = bp; * cx = loc_10EC; - * + * * do // for the line * { * outputBit(diPtr,0,*(siPtr)); * outputBit(diPtr,1,*(siPtr+1)); * outputBit(diPtr,2,*(siPtr+2)); * outputBit(diPtr,3,*(siPtr+3)); - * + * * siPtr+=4; * diPtr++; * }while (--cx); - * + * * diPtr += loc_1147; // interline * siPtr += loc_114B; * bp = bpSave; @@ -314,18 +314,18 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * loc_11E7 = ax&0xFF; * loc_127A = ax&0xFF; * loc_1203 = ax&0xFF; - * loc_122B = ax&0xFF; - * + * loc_122B = ax&0xFF; + * * ax = (ax&0xFF00) | (((bx&0xFF00)>>8)&0xFF); * loc_117F = ax&0xFF; * loc_11EF = ax&0xFF; * loc_1217 = ax&0xFF; - * + * * do // main copy loop * { * ax = bp; * loc_12E1 = ax; - * + * * if (loc_117C == 0xF8) * { * direction = 1; @@ -334,53 +334,53 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * { * direction = -1; * } - * + * * if (direction == -1) * { * goto label_11DC; * } - * + * * cx = loc_117F; - * + * * ax = (ax&0xFF00) | (((*siPtr)&0xFF)>>cx)&0xFF; * dx = (((ax&0xFF)<<8)&0xFF00) | (dx&0xFF); * ax = (((ax&0xFF)<<8)&0xFF00) | (ax&0xFF); - * + * * ax = (ax&0xFF00) | (((*(siPtr+1))&0xFF)>>cx)&0xFF; * dx = (dx&0xFF00) | (ax&0xFF); * ax = ((((((ax&0xFF00)>>8)&0xFF) | (ax&0xFF))<<8)&0xFF00) | (ax&0xFF); - * + * * ax = (ax&0xFF00) | (((*(siPtr+2))&0xFF)>>cx)&0xFF; * bx = (((ax&0xFF)<<8)&0xFF00) | (bx&0xFF); * ax = ((((((ax&0xFF00)>>8)&0xFF) | (ax&0xFF))<<8)&0xFF00) | (ax&0xFF); - * + * * ax = (ax&0xFF00) | (((*(siPtr+3))&0xFF)>>cx)&0xFF; * bx = (bx&0xFF00) | (ax&0xFF); * ax = ((((((ax&0xFF00)>>8)&0xFF) | (ax&0xFF))<<8)&0xFF00) | (ax&0xFF); - * + * * if (ax) * { * bp = dx; * ax = (ax&0xFF00) | (*diPtr)&0xFF; * ax = (ax&0xFF00) | 8; - * + * * outputBit(diPtr,0,(bp>>8)&0xFF); * outputBit(diPtr,1,(bp&0xFF)); * outputBit(diPtr,2,(bx>>8)&0xFF); * outputBit(diPtr,3,(bx&0xFF)); * } - * + * * diPtr++; - * + * * label_11DC: - * + * * bp = loc_11DC; * if (bp >0) * { * do * { * cx = loc_11E7; - * + * * ax = (ax&0xFF00) | (((*siPtr)&0xFF)>>cx)&0xFF; * dx = (((ax&0xFF)<<8)&0xFF00) | (dx&0xFF); * cx = loc_11EF; @@ -388,7 +388,7 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * dx = (((dx&0xFF00) | (((ax&0xFF)<<8)&0xFF00))&0xFF00) | (dx&0xFF); * ax = (ax&0xFF00) | (((ax&0xFF) | (((dx&0xFF00)>>8)&0xFF))&0xFF); * ax = ((ax&0xFF)<<8) | (ax&0xFF); - * + * * ax = (ax&0xFF00) | (((*(siPtr+5))&0xFF)>>cx)&0xFF; * dx = (dx&0xFF00) | (ax&0xFF); * cx = loc_1203; @@ -396,7 +396,7 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * dx = (dx&0xFF00) | ((dx&0xFF) | (ax&0xFF)); * ax = (ax&0xFF00) | ((ax&0xFF) | dx&0xFF); * ax = (ax&0xFF00) | ((ax&0xFF)<<8) | (ax&0xFF); - * + * * ax = (ax&0xFF00) | (((*(siPtr+2))&0xFF)>>cx)&0xFF; * bx = (((ax&0xFF)<<8)&0xFF00) | (bx&0xFF); * cx = loc_1217; @@ -404,7 +404,7 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * bx = (((bx&0xFF00) | (((ax&0xFF)<<8)&0xFF00))&0xFF00) | (bx&0xFF); * ax = (ax&0xFF00) | ((ax&0xFF) | ((bx&0xFF00)>>8)); * ax = (ax&0xFF00) | ((ax&0xFF)<<8) | (ax&0xFF); - * + * * ax = (ax&0xFF00) | (((*(siPtr+7))&0xFF)>>cx)&0xFF; * bx = (bx&0xFF00) | (ax&0xFF); * cx = loc_122B; @@ -412,24 +412,24 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * bx = (bx&0xFF00) | ((bx&0xFF) | (ax&0xFF)); * ax = (ax&0xFF00) | ((ax&0xFF) | bx&0xFF); * ax = (ax&0xFF00) | ((ax&0xFF)<<8) | (ax&0xFF); - * + * * if (ax) * { * cx = dx; * ax = (ax&0xFF00) | (*diPtr)&0xFF; * ax = (ax&0xFF00) | 8; - * + * * outputBit(diPtr,0,(cx>>8)&0xFF); * outputBit(diPtr,1,(cx&0xFF)); * outputBit(diPtr,2,(cx>>8)&0xFF); * outputBit(diPtr,3,(cx&0xFF)); * } - * + * * siPtr += 4; * diPtr++; * }while (--bp); * } - * + * * if (loc_122B == 0xF8) * { * direction = 1; @@ -438,49 +438,49 @@ void gfxModuleData_field_60(char *sourcePtr, int width, int height, * { * direction = -1; * } - * + * * if (direction == -1) * { * goto label_12D9; * } - * + * * cx = loc_127A; - * + * * ax = (ax&0xFF00) | (((*siPtr)&0xFF)>>cx)&0xFF; * dx = (((ax&0xFF)<<8)&0xFF00) | (dx&0xFF); * ax = (((ax&0xFF)<<8)&0xFF00) | (ax&0xFF); - * + * * ax = (ax&0xFF00) | (((*(siPtr+1))&0xFF)>>cx)&0xFF; * dx = (dx&0xFF00) | (ax&0xFF); * ax = ((((((ax&0xFF00)>>8)&0xFF) | (ax&0xFF))<<8)&0xFF00) | (ax&0xFF); - * + * * ax = (ax&0xFF00) | (((*(siPtr+2))&0xFF)>>cx)&0xFF; * bx = (((ax&0xFF)<<8)&0xFF00) | (bx&0xFF); * ax = ((((((ax&0xFF00)>>8)&0xFF) | (ax&0xFF))<<8)&0xFF00) | (ax&0xFF); - * + * * ax = (ax&0xFF00) | (((*(siPtr+3))&0xFF)>>cx)&0xFF; * bx = (bx&0xFF00) | (ax&0xFF); * ax = ((((((ax&0xFF00)>>8)&0xFF) | (ax&0xFF))<<8)&0xFF00) | (ax&0xFF); - * + * * if (ax) * { * bp = dx; * ax = (ax&0xFF00) | (*diPtr)&0xFF; * ax = (ax&0xFF00) | 8; - * + * * outputBit(diPtr,0,(bp>>8)&0xFF); * outputBit(diPtr,1,(bp&0xFF)); * outputBit(diPtr,2,(bx>>8)&0xFF); * outputBit(diPtr,3,(bx&0xFF)); * } - * + * * siPtr+=4; - * + * * label_12D9: * diPtr+=loc_12D9; * siPtr+=loc_12DD; * bp = loc_12E1; - * + * * }while (--bp); * } */ diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index d875a52d71..ab5a0c0c5b 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "base/plugins.h" #include "common/advancedDetector.h" @@ -110,7 +108,7 @@ static const DrasculaGameDescription gameDescriptions[] = { /** * The fallback game descriptor used by the Drascula engine's fallbackDetector. - * Contents of this struct are to be overwritten by the fallbackDetector. + * Contents of this struct are to be overwritten by the fallbackDetector. */ static DrasculaGameDescription g_fallbackDesc = { { diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index eb676a7be4..5f5b2cb525 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "common/events.h" #include "common/keyboard.h" #include "common/file.h" @@ -1462,7 +1460,7 @@ void DrasculaEngine::carga_escoba(const char *nom_fich) { getLine(ald, buffer, size); sscanf(buffer, "%s", num_room); strcat(num_room, ".alg"); - + getLine(ald, buffer, size); sscanf(buffer, "%d", &musica_room); getLine(ald, buffer, size); @@ -1582,7 +1580,7 @@ martini: strcpy(fondo_y_menu, "99.alg"); } } - + obj_salir = -1; for (l = 0; l < objs_room; l++) { if (num_obj[l] == obj_saliendo) @@ -1702,7 +1700,7 @@ martini: hare_se_ve = 0; if (!strcmp(num_room, "49.alg") && flags[7] == 0) animacion_4_5(); - + refresca_pantalla(); } @@ -2065,7 +2063,7 @@ void DrasculaEngine::saves() { for (n = 0; n < NUM_SAVES; n++) { if (x_raton > 115 && y_raton > y + (9 * n) && x_raton < 115 + 175 && y_raton < y + 10 + (9 * n)) { strcpy(select, nombres[n]); - + // FIXME: The indention is wrong and misleading here!!! Or maybe there's simply a // closing brace missing here??? See below for a second FIXME of a similar kind... @@ -3405,7 +3403,7 @@ void DrasculaEngine::hablar(const char *dicho, const char *filename) { if (factor_red[hare_y + alto_hare] == 100) suma_1_pixel = 0; - + if (num_ejec == 2) buffer_teclado(); @@ -3460,7 +3458,7 @@ bucless: } else if (sentido_hare == 1) { if (num_ejec == 1) reduce_hare_chico(x_habla_dch[cara], y_mask_habla, hare_x + 12 * factor_red[hare_y + alto_hare] / 100, - hare_y, ancho_habla,alto_habla, factor_red[hare_y + alto_hare], + hare_y, ancho_habla,alto_habla, factor_red[hare_y + alto_hare], dir_hare_dch, dir_zona_pantalla); else if (num_ejec == 2) DIBUJA_BLOQUE(x_habla_dch[cara], y_mask_habla, hare_x + 8, hare_y, ancho_habla, alto_habla, @@ -6168,7 +6166,7 @@ void DrasculaEngine::animacion_2_2() { x = x + 50; pausa(3); } - + x = 0; for (n = 0; n < 6; n++){ @@ -6212,7 +6210,7 @@ void DrasculaEngine::animacion_2_2() { DIBUJA_FONDO(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); VUELCA_PANTALLA(0, 0, 0, 0, 320, 200, dir_zona_pantalla); - fin_sound(); + fin_sound(); pausa (4); @@ -6341,7 +6339,7 @@ void DrasculaEngine::animacion_14() { pos_cabina[3] = -160; pos_cabina[4] = 158; pos_cabina[5] = 161; - + for (n = -160; n <= 0; n = n + 5 + l) { DIBUJA_FONDO(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); actualiza_refresco_antes(); @@ -6361,7 +6359,7 @@ void DrasculaEngine::animacion_14() { comienza_sound("s7.als"); hipo(15); - fin_sound(); + fin_sound(); lee_dibujos("99.alg"); descomprime_dibujo(dir_hare_fondo, 1); @@ -6459,7 +6457,7 @@ void DrasculaEngine::animacion_16() { if (key != 0) goto asco; - _system->delayMillis(4); + _system->delayMillis(4); key = getscan(); if (key != 0) goto asco; @@ -6487,7 +6485,7 @@ asco: VUELCA_PANTALLA(0, 0, 0, 0, 320, 200, dir_zona_pantalla); FundeDelNegro(0); if (musica_room != 0) - playmusic(musica_room); + playmusic(musica_room); else stopmusic(); } @@ -6517,7 +6515,7 @@ void DrasculaEngine::animacion_20() { } else { hablar(TEXT386, "386.als"); habla_vbpuerta(TEXTVB12, "VB12.als"); - flags[18] = 0; + flags[18] = 0; flags[14] = 1; abre_puerta(15, 1); sal_de_la_habitacion(1); @@ -6542,7 +6540,7 @@ void DrasculaEngine::animacion_23() { flags[21] = 1; - if (flags[25] == 0) { + if (flags[25] == 0) { habla_vb(TEXTVB13, "VB13.als"); habla_vb(TEXTVB14, "VB14.als"); pausa(10); @@ -6550,7 +6548,7 @@ void DrasculaEngine::animacion_23() { } habla_vb(TEXTVB15, "VB15.als"); - lleva_vb(42); + lleva_vb(42); sentido_vb = 1; habla_vb(TEXTVB16, "VB16.als"); sentido_vb = 2; @@ -6573,7 +6571,7 @@ void DrasculaEngine::animacion_23() { animacion_25(); lleva_vb(99); - if (flags[29] == 0) { + if (flags[29] == 0) { habla_vb(TEXTVB19, "VB19.als"); if (flags[25] == 0) { habla_vb(TEXTVB20,"VB20.als"); @@ -6643,7 +6641,7 @@ void DrasculaEngine::animacion_25() { descomprime_dibujo(dir_hare_fondo, 1); lee_dibujos("18.alg"); descomprime_dibujo(dir_dibujo1, 1); - + pos_cabina[0] = 150; pos_cabina[1] = 6; pos_cabina[2] = 69; @@ -6652,9 +6650,9 @@ void DrasculaEngine::animacion_25() { pos_cabina[5] = 161; flags[24] = 0; - + comienza_sound("s6.als"); - + for (n = 0; n >= -160; n = n - 8) { DIBUJA_FONDO(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); @@ -6669,14 +6667,14 @@ void DrasculaEngine::animacion_25() { actualiza_refresco(); VUELCA_PANTALLA(0, 0, 0, 0, 320, 200, dir_zona_pantalla); } - + fin_sound(); lee_dibujos("99.alg"); descomprime_dibujo(dir_hare_fondo, 1); } -void DrasculaEngine::animacion_27() { +void DrasculaEngine::animacion_27() { flags[22] = 1; sin_verbo(); @@ -6695,14 +6693,14 @@ void DrasculaEngine::animacion_27() { habla_vb(TEXTVB26,"VB26.als"); } -void DrasculaEngine::animacion_28(){ +void DrasculaEngine::animacion_28(){ habla_vb(TEXTVB27, "VB27.als"); habla_vb(TEXTVB28, "VB28.als"); habla_vb(TEXTVB29, "VB29.als"); habla_vb(TEXTVB30, "VB30.als"); } -void DrasculaEngine::animacion_29(){ +void DrasculaEngine::animacion_29(){ if (flags[33] == 0) { habla_vb(TEXTVB32, "VB32.als"); hablar(TEXT398, "398.als"); @@ -6733,12 +6731,12 @@ void DrasculaEngine::animacion_29(){ hablar(TEXT386, "386.als"); } -void DrasculaEngine::animacion_30(){ +void DrasculaEngine::animacion_30(){ habla_vb(TEXTVB31, "VB31.als"); hablar(TEXT396, "396.als"); } -void DrasculaEngine::animacion_31(){ +void DrasculaEngine::animacion_31(){ habla_vb(TEXTVB44, "VB44.als"); lleva_vb(-50); pausa(15); @@ -6756,11 +6754,11 @@ void DrasculaEngine::animacion_31(){ hablar(TEXT406, "406.als"); lleva_vb(98); habla_vb(TEXTVB45, "VB45.als"); - habla_vb(TEXTVB46, "VB46.als"); + habla_vb(TEXTVB46, "VB46.als"); habla_vb(TEXTVB47, "VB47.als"); hablar(TEXT407, "407.als"); habla_vb(TEXTVB48, "VB48.als"); - habla_vb(TEXTVB49, "VB49.als"); + habla_vb(TEXTVB49, "VB49.als"); hablar(TEXT408, "408.als"); habla_vb(TEXTVB50, "VB50.als"); habla_vb(TEXTVB51, "VB51.als"); @@ -7019,7 +7017,7 @@ bucless: DIBUJA_FONDO(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); pos_ciego[5] = 149; char c = toupper(sincronia[p]); - if (c == '0') + if (c == '0') cara = 0; if (c == '1') cara = 1; @@ -7098,7 +7096,7 @@ void DrasculaEngine::habla_hacker(const char *dicho, const char *filename) { DIBUJA_FONDO(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla); VUELCA_PANTALLA(0, 0, 0, 0, 320, 200, dir_zona_pantalla); - + color_abc(AMARILLO); if (hay_sb == 1) { @@ -7250,7 +7248,7 @@ void DrasculaEngine::abre_puerta(int nflag, int n_puerta) { comienza_sound("s3.als"); flags[nflag] = 1; } - if (num_ejec == 1 && nflag == 7) + if (num_ejec == 1 && nflag == 7) return; comienza_sound("s3.als"); flags[nflag] = 1; @@ -8618,7 +8616,7 @@ bucless: pon_hare(); actualiza_refresco(); - if (con_voces == 0) + if (con_voces == 0) centra_texto(dicho, 203, 78); VUELCA_PANTALLA(0, 0, 0, 0, 320, 200, dir_zona_pantalla); diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index 229e6d71b3..c34048ed8e 100644 --- a/engines/drascula/drascula.h +++ b/engines/drascula/drascula.h @@ -26,7 +26,6 @@ #ifndef DRASCULA_H #define DRASCULA_H -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/endian.h" #include "common/util.h" diff --git a/engines/engine.cpp b/engines/engine.cpp index 9750812f5e..6f40e936b6 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -29,7 +29,6 @@ #undef ARRAYSIZE #endif -#include "common/stdafx.h" #include "engines/engine.h" #include "common/config-manager.h" #include "common/file.h" diff --git a/engines/engine.h b/engines/engine.h index f9aeb7718f..36b04e464d 100644 --- a/engines/engine.h +++ b/engines/engine.h @@ -25,7 +25,6 @@ #ifndef BASE_ENGINE_H #define BASE_ENGINE_H -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/str.h" @@ -60,7 +59,7 @@ private: * The autosave interval, given in second. Used by shouldPerformAutoSave. */ int _autosavePeriod; - + /** * The pause level, 0 means 'running', a positive value indicates * how often the engine has been paused (and hence how often it has @@ -95,7 +94,7 @@ public: * invoke the debugger when a severe error is reported. */ virtual GUI::Debugger *getDebugger() { return 0; } - + /** * Pause or resume the engine. This should stop/resume any audio playback * and other stuff. Called right before the system runs a global dialog @@ -108,7 +107,7 @@ public: * @param pause true to pause the engine, false to resume it */ void pauseEngine(bool pause); - + /** * Return whether the engine is currently paused or not. */ @@ -127,7 +126,7 @@ public: /** Initialized graphics and shows error message. */ void GUIErrorMessage(const Common::String msg); - + /** * Actual implementation of pauseEngine by subclasses. See there * for details. diff --git a/engines/gob/cdrom.cpp b/engines/gob/cdrom.cpp index 1c26199bc1..5afdc832f1 100644 --- a/engines/gob/cdrom.cpp +++ b/engines/gob/cdrom.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "sound/audiocd.h" diff --git a/engines/gob/coktelvideo.cpp b/engines/gob/coktelvideo.cpp index c15ffb4a1d..a61addb2b6 100644 --- a/engines/gob/coktelvideo.cpp +++ b/engines/gob/coktelvideo.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "common/system.h" @@ -194,7 +193,7 @@ void Imd::setXY(int16 x, int16 y) { if (y >= 0) _stdY = _stdY - _y + y; } - + // Going through the coordinate table as well if (_frameCoords) { for (int i = 0; i < _framesCount; i++) { @@ -1116,7 +1115,7 @@ CoktelVideo::State Vmd::processFrame(uint16 frame) { _stream->read(_palette + index * 3, (count + 1) * 3); _stream->skip((255 - count) * 3); - + state.flags |= kStatePalette; } diff --git a/engines/gob/dataio.cpp b/engines/gob/dataio.cpp index 7fd461b93c..d6d8e62372 100644 --- a/engines/gob/dataio.cpp +++ b/engines/gob/dataio.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/dataio.h b/engines/gob/dataio.h index b30a389865..7a6435e095 100644 --- a/engines/gob/dataio.h +++ b/engines/gob/dataio.h @@ -26,7 +26,7 @@ #ifndef GOB_DATAIO_H #define GOB_DATAIO_H -#include "common/stdafx.h" + #include "common/endian.h" #include "common/file.h" diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index bfd2a0edfc..22b249a4a8 100644 --- a/engines/gob/detection.cpp +++ b/engines/gob/detection.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "base/plugins.h" #include "common/advancedDetector.h" diff --git a/engines/gob/draw.cpp b/engines/gob/draw.cpp index acf4d5765b..59ef109060 100644 --- a/engines/gob/draw.cpp +++ b/engines/gob/draw.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" @@ -62,7 +62,7 @@ Draw::Draw(GobEngine *vm) : _vm(vm) { for (int i = 0; i < 8; i++) _fonts[i] = 0; - + for (int i = 0; i < SPRITES_COUNT; i++) _spritesArray[i] = 0; @@ -357,7 +357,7 @@ void Draw::printTextCentered(int16 id, int16 left, int16 top, int16 right, _vm->_global->_inter_execPtr = storedIP; } - + if (str[0] == '\0') return; diff --git a/engines/gob/draw_v1.cpp b/engines/gob/draw_v1.cpp index 9c4708f187..a2bcf1d693 100644 --- a/engines/gob/draw_v1.cpp +++ b/engines/gob/draw_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "graphics/cursorman.h" @@ -50,7 +50,7 @@ void Draw_v1::closeScreen() { void Draw_v1::blitCursor() { if (_cursorIndex == -1) return; - + if (_showCursor == 2) _showCursor = 0; } diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp index 55585f5619..6c6250bd09 100644 --- a/engines/gob/draw_v2.cpp +++ b/engines/gob/draw_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "graphics/cursorman.h" @@ -47,7 +47,7 @@ void Draw_v2::initScreen() { initSpriteSurf(21, _vm->_video->_surfWidth, _vm->_video->_surfHeight, 0); _backSurface = _spritesArray[21]; _vm->_video->clearSurf(_backSurface); - + initSpriteSurf(23, 32, 16, 2); _cursorSpritesBack = _spritesArray[23]; _cursorSprites = _cursorSpritesBack; @@ -69,7 +69,7 @@ void Draw_v2::closeScreen() { void Draw_v2::blitCursor() { if (_cursorIndex == -1) return; - + _showCursor = (_showCursor & ~2) | ((_showCursor & 1) << 1); } @@ -122,7 +122,7 @@ void Draw_v2::animateCursor(int16 cursor) { _vm->_util->getTimeKey())) { _cursorAnim++; if ((_cursorAnimHigh[_cursorIndex] < _cursorAnim) || - (_cursorAnimLow[_cursorIndex] > _cursorAnim)) + (_cursorAnimLow[_cursorIndex] > _cursorAnim)) _cursorAnim = _cursorAnimLow[_cursorIndex]; _cursorTimeKey = _vm->_util->getTimeKey(); } else { @@ -353,7 +353,7 @@ void Draw_v2::printTotText(int16 id) { memset(str, ' ', 80); _backColor = 0; _transparency = 1; - + while (true) { if ((((*ptr >= 1) && (*ptr <= 7)) || (*ptr == 10)) && (strPos != 0)) { str[MAX(strPos, strPos2)] = 0; diff --git a/engines/gob/driver_vga.cpp b/engines/gob/driver_vga.cpp index ef1c9c328c..73ae355415 100644 --- a/engines/gob/driver_vga.cpp +++ b/engines/gob/driver_vga.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "graphics/primitives.h" @@ -53,7 +53,7 @@ void VGAVideoDriver::drawLine(SurfaceDesc *dest, int16 x0, int16 y0, int16 x1, void VGAVideoDriver::fillRect(SurfaceDesc *dest, int16 left, int16 top, int16 right, int16 bottom, byte color) { - + if ((left >= dest->getWidth()) || (right >= dest->getWidth()) || (top >= dest->getHeight()) || (bottom >= dest->getHeight())) return; @@ -114,11 +114,11 @@ void VGAVideoDriver::drawSprite(SurfaceDesc *source, SurfaceDesc *dest, byte *destPos = dest->getVidMem() + (y * dest->getWidth()) + x; if (transp) { - while (height--) { + while (height--) { for (int16 i = 0; i < width; ++i) { if (srcPos[i]) destPos[i] = srcPos[i]; - } + } srcPos += source->getWidth(); destPos += dest->getWidth(); @@ -129,7 +129,7 @@ void VGAVideoDriver::drawSprite(SurfaceDesc *source, SurfaceDesc *dest, srcPos += source->getWidth(); destPos += dest->getWidth(); - } + } } } diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp index 37817c12a3..cdf7dfb411 100644 --- a/engines/gob/game.cpp +++ b/engines/gob/game.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" @@ -89,7 +89,7 @@ Game::Game(GobEngine *vm) : _vm(vm) { _backupedCount = 0; _curBackupPos = 0; - + for (int i = 0; i < 5; i++) { _cursorHotspotXArray[i] = 0; _cursorHotspotYArray[i] = 0; diff --git a/engines/gob/game_v1.cpp b/engines/gob/game_v1.cpp index 3f681ddd1f..c6830686fe 100644 --- a/engines/gob/game_v1.cpp +++ b/engines/gob/game_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/stream.h" diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp index 8a528a96f5..37acf204b6 100644 --- a/engines/gob/game_v2.cpp +++ b/engines/gob/game_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/stream.h" diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 8dee9c9e32..80eeeb6d3f 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "base/plugins.h" diff --git a/engines/gob/gob.h b/engines/gob/gob.h index d573dc3a89..4bd0ab96c3 100644 --- a/engines/gob/gob.h +++ b/engines/gob/gob.h @@ -26,7 +26,7 @@ #ifndef GOB_GOB_H #define GOB_GOB_H -#include "common/stdafx.h" + #include "common/system.h" #include "common/savefile.h" diff --git a/engines/gob/goblin_v1.cpp b/engines/gob/goblin_v1.cpp index f8ffb15257..7a66758bce 100644 --- a/engines/gob/goblin_v1.cpp +++ b/engines/gob/goblin_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/goblin_v2.cpp b/engines/gob/goblin_v2.cpp index 608b0f0790..0b7bef4f7b 100644 --- a/engines/gob/goblin_v2.cpp +++ b/engines/gob/goblin_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/init.cpp b/engines/gob/init.cpp index 1c6d7faa3b..856b088e12 100644 --- a/engines/gob/init.cpp +++ b/engines/gob/init.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/init_v1.cpp b/engines/gob/init_v1.cpp index 679c20e380..1f73500a67 100644 --- a/engines/gob/init_v1.cpp +++ b/engines/gob/init_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/init_v2.cpp b/engines/gob/init_v2.cpp index 175d82fda0..790a0f7694 100644 --- a/engines/gob/init_v2.cpp +++ b/engines/gob/init_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/init_v3.cpp b/engines/gob/init_v3.cpp index 61e7fb61d0..16057332f1 100644 --- a/engines/gob/init_v3.cpp +++ b/engines/gob/init_v3.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/inter.cpp b/engines/gob/inter.cpp index 4da3746681..0f76ff4bbc 100644 --- a/engines/gob/inter.cpp +++ b/engines/gob/inter.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp index 492ea198a1..a7af1d45e1 100644 --- a/engines/gob/inter_bargon.cpp +++ b/engines/gob/inter_bargon.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 9f30d9dea2..02434bca4d 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/file.h" @@ -753,7 +753,7 @@ void Inter_v1::checkSwitchTable(byte **ppExec) { READ_LE_UINT16(_vm->_global->_inter_execPtr + 2) + 2; found = false; len = (int8) *_vm->_global->_inter_execPtr++; - } + } if ((*_vm->_global->_inter_execPtr >> 4) != 4) return; @@ -1290,7 +1290,7 @@ bool Inter_v1::o1_if(OpFuncParams ¶ms) { byte cmd; bool boolRes; byte *storedIP; - + boolRes = evalBoolResult(); if (boolRes) { if ((params.counter == params.cmdCount) && (params.retFlag == 2)) @@ -1611,7 +1611,7 @@ bool Inter_v1::o1_palLoad(OpFuncParams ¶ms) { } break; } - + if (!_vm->_draw->_applyPal) { _vm->_global->_pPaletteDesc->unused2 = _vm->_draw->_unusedPalette2; _vm->_global->_pPaletteDesc->unused1 = _vm->_draw->_unusedPalette1; diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index b2ca8716be..34f82850cf 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "sound/mixer.h" #include "sound/mods/infogrames.h" @@ -747,7 +747,7 @@ void Inter_v2::checkSwitchTable(byte **ppExec) { case 26: value = READ_VARO_UINT32(value); break; - + default: value = (int16) READ_VARO_UINT16(value); break; @@ -841,7 +841,7 @@ void Inter_v2::o2_setRenderFlags() { int16 expr; expr = _vm->_parse->parseValExpr(); - + if (expr & 0x8000) { _vm->_draw->_renderFlags |= expr & 0x3FFF; } else { @@ -1084,7 +1084,7 @@ void Inter_v2::o2_stopCD() { void Inter_v2::o2_readLIC() { char path[40]; - + evalExpr(0); strncpy0(path, _vm->_global->_inter_resStr, 35); strcat(path, ".LIC"); @@ -1285,8 +1285,8 @@ void Inter_v2::o2_setGoblinState() { objAnim.newCycle = animLayer->framesCount; break; - case 1: - case 4: + case 1: + case 4: case 6: layer = obj.goblinStates[objAnim.state][0].layer; animation = obj.goblinStates[objAnim.state][0].animation; @@ -1414,7 +1414,7 @@ void Inter_v2::o2_initScreen() { _vm->_video->_surfWidth = width; if (height > 0) _vm->_video->_surfHeight = height; - + _vm->_video->_splitHeight1 = MIN<int16>(_vm->_height, _vm->_video->_surfHeight - offY); _vm->_video->_splitHeight2 = offY; @@ -1518,7 +1518,7 @@ void Inter_v2::o2_playImd() { palStart = _vm->_parse->parseValExpr(); palEnd = _vm->_parse->parseValExpr(); palCmd = 1 << (flags & 0x3F); - + if ((imd[0] != 0) && !_vm->_vidPlayer->openVideo(imd, x, y, flags)) { WRITE_VAR(11, -1); return; @@ -2124,7 +2124,7 @@ int16 Inter_v2::loadSound(int16 search) { } } } - + _vm->_game->freeSoundSlot(slot); if (id == -1) { @@ -2155,7 +2155,7 @@ int16 Inter_v2::loadSound(int16 search) { dataPtr = (byte *) _vm->_game->loadTotResource(id, &totSize); dataSize = (uint32) ((int32) totSize); } - + if (dataPtr) { _vm->_game->_soundSamples[slot].load(type, source, dataPtr, dataSize); _vm->_game->_soundSamples[slot]._id = id; diff --git a/engines/gob/inter_v3.cpp b/engines/gob/inter_v3.cpp index 7baa451f81..e80181ff4a 100644 --- a/engines/gob/inter_v3.cpp +++ b/engines/gob/inter_v3.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "common/file.h" diff --git a/engines/gob/inter_v4.cpp b/engines/gob/inter_v4.cpp index 81f53757a3..5a91957b2b 100644 --- a/engines/gob/inter_v4.cpp +++ b/engines/gob/inter_v4.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "common/file.h" @@ -736,7 +735,7 @@ void Inter_v4::o4_playVmdOrMusic() { palStart = _vm->_parse->parseValExpr(); palEnd = _vm->_parse->parseValExpr(); palCmd = 1 << (flags & 0x3F); - + close = false; if (lastFrame == -1) { close = true; diff --git a/engines/gob/map.cpp b/engines/gob/map.cpp index d467348039..2a77a60e28 100644 --- a/engines/gob/map.cpp +++ b/engines/gob/map.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "gob/gob.h" #include "gob/map.h" diff --git a/engines/gob/map_v1.cpp b/engines/gob/map_v1.cpp index 7134527592..c2ffee2227 100644 --- a/engines/gob/map_v1.cpp +++ b/engines/gob/map_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/stream.h" #include "gob/gob.h" @@ -283,7 +283,7 @@ void Map_v1::loadObjects(Common::SeekableReadStream &data, uint32 objsPos) { Goblin::Gob_State *pState; uint32 tmpStateData[40 * 6]; uint32 tmpPos; - + _vm->_goblin->_objCount = data.readUint16LE(); for (int i = 0; i < _vm->_goblin->_objCount; i++) { _vm->_goblin->_objects[i] = new Goblin::Gob_Object; diff --git a/engines/gob/map_v2.cpp b/engines/gob/map_v2.cpp index 5133ac1286..1ab98e5d44 100644 --- a/engines/gob/map_v2.cpp +++ b/engines/gob/map_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/stream.h" #include "gob/gob.h" diff --git a/engines/gob/map_v4.cpp b/engines/gob/map_v4.cpp index fb398ecbaf..5eb37b1316 100644 --- a/engines/gob/map_v4.cpp +++ b/engines/gob/map_v4.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/stream.h" #include "gob/gob.h" diff --git a/engines/gob/mult.cpp b/engines/gob/mult.cpp index 49f36a0d21..ad69ee93bc 100644 --- a/engines/gob/mult.cpp +++ b/engines/gob/mult.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/mult_v1.cpp b/engines/gob/mult_v1.cpp index 0c367870ac..63d94f19f7 100644 --- a/engines/gob/mult_v1.cpp +++ b/engines/gob/mult_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/stream.h" diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp index ddce90df0c..9f9ab58644 100644 --- a/engines/gob/mult_v2.cpp +++ b/engines/gob/mult_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/stream.h" @@ -64,7 +64,7 @@ void Mult_v2::loadMult(int16 resId) { uint32 dataSize; byte *extData; bool hasImds; - + index = (resId & 0x8000) ? *_vm->_global->_inter_execPtr++ : 0; resId &= 0x7FFF; @@ -238,7 +238,7 @@ void Mult_v2::loadMult(int16 resId) { _multData->sndKeys[i].cmd); } } - + _multData->imdFiles = 0; _multData->somepointer10 = 0; @@ -321,7 +321,7 @@ void Mult_v2::freeMultKeys() { for (int i = 0; i < _multData->sndSlotsCount; i++) if (!(_multData->sndSlot[i] & 0x8000)) _vm->_game->freeSoundSlot(_multData->sndSlot[i]); - + delete[] _multData->sndKeys; delete[] _multData->imdFiles; @@ -329,7 +329,7 @@ void Mult_v2::freeMultKeys() { if (_animDataAllocated) { freeMult(); - + delete[] _animArrayX; delete[] _animArrayY; delete[] _animArrayData; @@ -418,7 +418,7 @@ void Mult_v2::multSub(uint16 multIndex) { expr = _vm->_parse->parseValExpr(); _multData->animKeysFrames[index] = expr; _multData->animKeysStartFrames[index] = expr; - + WRITE_VAR(18 + index, expr); if (expr == -1) { if (!_objects) @@ -589,7 +589,7 @@ void Mult_v2::drawStatics(bool &stop) { _vm->_scenery->_curStatic = 0; _vm->_scenery->_curStaticLayer = _multData->staticKeys[_counter].layer; - + staticIndex = _multData->staticIndices[i]; while (_vm->_scenery->getStaticLayersCount(staticIndex) <= _vm->_scenery->_curStaticLayer) { @@ -625,7 +625,7 @@ void Mult_v2::drawStatics(bool &stop) { void Mult_v2::drawAnims(bool &stop) { // loc_50D5 int16 count; int animIndex; - + for (int i = 0; i < 4; i++) { int16 animKeysCount = _multData->animKeysCount[i]; if (_multData->animKeys[i][animKeysCount - 1].frame > _frame) @@ -641,7 +641,7 @@ void Mult_v2::drawAnims(bool &stop) { // loc_50D5 if (key.frame != _frame) continue; - + if (key.layer != -1) { *(animObj.pPosX) = key.posX; *(animObj.pPosY) = key.posY; @@ -740,7 +740,7 @@ void Mult_v2::animate() { int orderArrayPos = 0; int8 animIndices[150]; int numAnims = 0; - + if (!_objects) return; @@ -752,7 +752,7 @@ void Mult_v2::animate() { orderArray = 0; advanceAllObjects(); - + // Find relevant objects for (int i = 0; i < _objCount; i++) { Mult_Object &animObj = _objects[i]; @@ -778,7 +778,7 @@ void Mult_v2::animate() { animObj.newLeft = 1000; animObj.newBottom = 0; animObj.newRight = 0; - + if (animData.isStatic == 2) continue; @@ -1085,7 +1085,7 @@ void Mult_v2::advanceObjects(int16 index) { int16 frame; bool stop = false; bool hasImds = false; - + frame = _multData->animKeysFrames[index]; if (frame == -1) return; @@ -1193,7 +1193,7 @@ void Mult_v2::advanceObjects(int16 index) { playImd(imdFile, key, dir, startFrame); } } - + if (!hasImds && (_vm->_draw->_showCursor == 3)) _vm->_game->_preventScroll = false; diff --git a/engines/gob/music.cpp b/engines/gob/music.cpp index 0f38827363..19bc592e79 100644 --- a/engines/gob/music.cpp +++ b/engines/gob/music.cpp @@ -24,7 +24,7 @@ */ #include "common/file.h" -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" @@ -69,7 +69,7 @@ const char *Adlib::_trackFiles[] = { }; const unsigned char Adlib::_operators[] = {0, 1, 2, 8, 9, 10, 16, 17, 18}; -const unsigned char Adlib::_volRegNums[] = { +const unsigned char Adlib::_volRegNums[] = { 3, 4, 5, 11, 12, 13, 19, 20, 21 @@ -176,8 +176,8 @@ void Adlib::setFreqs() { _notCol[lin] = 0; _notLin[lin] = 0; _notOn[lin] = false; - } - + } + // Run through the 25 lines for (lin = 0; lin < 25; lin ++) { // Run through the 12 columns @@ -187,7 +187,7 @@ void Adlib::setFreqs() { 9 / 0x1B503; _freqs[lin][col] = (short)((val + 4) >> 3); val = val * 0x6A / 0x64; - } + } } } @@ -429,7 +429,7 @@ void Adlib::playBgMusic() { void Adlib::playTrack(const char *trackname) { if (_playing) return; - + debugC(1, kDebugMusic, "Adlib::playTrack(%s)", trackname); unload(); load(_trackFiles[_vm->_util->getRandom(ARRAYSIZE(_trackFiles))]); @@ -453,7 +453,7 @@ bool Adlib::load(const char *fileName) { reset(); setVoices(); _playPos = _data + 3 + (_data[1] + 1) * 0x38; - + return true; } diff --git a/engines/gob/parse.cpp b/engines/gob/parse.cpp index 35b17e5543..3fef873a73 100644 --- a/engines/gob/parse.cpp +++ b/engines/gob/parse.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/parse_v1.cpp b/engines/gob/parse_v1.cpp index b4c8555743..214735fc61 100644 --- a/engines/gob/parse_v1.cpp +++ b/engines/gob/parse_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/parse_v2.cpp b/engines/gob/parse_v2.cpp index dacdcc917f..515be9b282 100644 --- a/engines/gob/parse_v2.cpp +++ b/engines/gob/parse_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/saveload.cpp b/engines/gob/saveload.cpp index ea22ede7b6..4d9e24b92f 100644 --- a/engines/gob/saveload.cpp +++ b/engines/gob/saveload.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "common/file.h" @@ -72,7 +71,7 @@ SaveLoad::~SaveLoad() { delete[] _saveFiles[0]; delete[] _saveFiles[2]; - delete[] _saveFiles; + delete[] _saveFiles; } const char *SaveLoad::setCurSlot(int slot) { diff --git a/engines/gob/saveload_v2.cpp b/engines/gob/saveload_v2.cpp index b8d8d44557..676face1eb 100644 --- a/engines/gob/saveload_v2.cpp +++ b/engines/gob/saveload_v2.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "common/file.h" @@ -215,7 +214,7 @@ bool SaveLoad_v2::saveGame(int16 dataVar, int32 size, int32 offset) { Common::SaveFileManager *saveMan = g_system->getSavefileManager(); Common::OutSaveFile *out; - + out = saveMan->openForSaving(setCurSlot(slot)); if (!out) { warning("Can't open file for slot %d for writing", slot); diff --git a/engines/gob/saveload_v3.cpp b/engines/gob/saveload_v3.cpp index f8f69342fe..6d362c5a91 100644 --- a/engines/gob/saveload_v3.cpp +++ b/engines/gob/saveload_v3.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "common/file.h" diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp index 95cf90bddc..0d08061b4f 100644 --- a/engines/gob/scenery.cpp +++ b/engines/gob/scenery.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/stream.h" @@ -551,7 +551,7 @@ void Scenery::freeAnim(int16 index) { _spriteResId[spr] = -1; } } - + for (int i = 0; i < _animations[index].layersCount; i++) delete[] _animations[index].layers[i].frames; delete[] _animations[index].layers; diff --git a/engines/gob/scenery_v1.cpp b/engines/gob/scenery_v1.cpp index 8d73be4194..8c3c13eda1 100644 --- a/engines/gob/scenery_v1.cpp +++ b/engines/gob/scenery_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/scenery_v2.cpp b/engines/gob/scenery_v2.cpp index 577bf1a87a..5c2fd2b340 100644 --- a/engines/gob/scenery_v2.cpp +++ b/engines/gob/scenery_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/sound.cpp b/engines/gob/sound.cpp index b47e6795ac..1c2cf2d716 100644 --- a/engines/gob/sound.cpp +++ b/engines/gob/sound.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" @@ -152,7 +152,7 @@ int Snd::SquareWaveStream::readBuffer(int16 *buffer, const int numSamples) { _remainingSamples--; _mixedSamples++; } - + // Clear the rest of the buffer if (i < numSamples) memset(buffer + i, 0, (numSamples - i) * sizeof(int16)); @@ -196,7 +196,7 @@ Snd::Snd(GobEngine *vm) : _vm(vm) { Snd::~Snd() { // stop permanent streams manually: - + // First the speaker stream _vm->_mixer->stopHandle(_speakerHandle); @@ -365,7 +365,7 @@ void Snd::playSample(SoundDesc &sndDesc, int16 repCount, int16 frequency, Common::StackLock slock(_mutex); if (!_end) - return; + return; setSample(sndDesc, repCount, frequency, fadeLength); } @@ -400,7 +400,7 @@ int Snd::readBuffer(int16 *buffer, const int numSamples) { int32 val = (_last + (((_cur - _last) * _offsetFrac + FRAC_HALF) >> FRAC_BITS)) << 8; *buffer++ = (val * _fadeVol) >> 16; - + _offsetFrac += _offsetInc; // Was there an integral change? diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp index 40acf21f9e..6e9021c5c5 100644 --- a/engines/gob/util.cpp +++ b/engines/gob/util.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/events.h" #include "gob/gob.h" diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp index ffedd6d1f6..bba272f411 100644 --- a/engines/gob/video.cpp +++ b/engines/gob/video.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "graphics/cursorman.h" @@ -145,7 +145,7 @@ SurfaceDesc *Video::initSurfDesc(int16 vidMode, int16 width, int16 height, _vm->_global->_mouseMaxCol = width; _vm->_global->_primaryHeight = height; _vm->_global->_mouseMaxRow = height; - + descPtr = _vm->_global->_primarySurfDesc; descPtr->resize(width, height); descPtr->_vidMode = vidMode; @@ -258,7 +258,7 @@ void Video::drawCircle(SurfaceDesc *dest, int16 x0, int16 y0, } x++; ddFx += 2; - f += ddFx + 1; + f += ddFx + 1; putPixel(x0 + x, y0 + y, color, dest); putPixel(x0 - x, y0 + y, color, dest); putPixel(x0 + x, y0 - y, color, dest); diff --git a/engines/gob/video_v1.cpp b/engines/gob/video_v1.cpp index 15b561b584..59b411d912 100644 --- a/engines/gob/video_v1.cpp +++ b/engines/gob/video_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/gob/video_v2.cpp b/engines/gob/video_v2.cpp index bdc4767445..3e0c13f025 100644 --- a/engines/gob/video_v2.cpp +++ b/engines/gob/video_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "gob/gob.h" diff --git a/engines/kyra/animator_v1.cpp b/engines/kyra/animator_v1.cpp index 4169b59a36..82b7e34dbe 100644 --- a/engines/kyra/animator_v1.cpp +++ b/engines/kyra/animator_v1.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "kyra/kyra_v1.h" @@ -88,7 +87,7 @@ void ScreenAnimator::initAnimStateList() { animStates[0].height = 48; animStates[0].width2 = 4; animStates[0].height2 = 3; - + for (int i = 1; i <= 4; ++i) { animStates[i].index = i; animStates[i].active = 0; @@ -100,13 +99,13 @@ void ScreenAnimator::initAnimStateList() { animStates[i].width2 = 4; animStates[i].height2 = 3; } - + for (int i = 5; i < 16; ++i) { animStates[i].index = i; animStates[i].active = 0; animStates[i].flags = 0; } - + for (int i = 16; i < 28; ++i) { animStates[i].index = i; animStates[i].flags = 0; @@ -157,7 +156,7 @@ void ScreenAnimator::restoreAllObjectBackgrounds() { debugC(9, kDebugLevelAnimator, "ScreenAnimator::restoreAllObjectBackground()"); AnimObject *curObject = _objectQueue; _screen->_curPage = 2; - + while (curObject) { if (curObject->active && !curObject->disable) { preserveOrRestoreBackground(curObject, true); @@ -166,7 +165,7 @@ void ScreenAnimator::restoreAllObjectBackgrounds() { } curObject = curObject->nextAnimObject; } - + _screen->_curPage = 0; } @@ -174,7 +173,7 @@ void ScreenAnimator::preserveAnyChangedBackgrounds() { debugC(9, kDebugLevelAnimator, "ScreenAnimator::preserveAnyChangedBackgrounds()"); AnimObject *curObject = _objectQueue; _screen->_curPage = 2; - + while (curObject) { if (curObject->active && !curObject->disable && curObject->bkgdChangeFlag) { preserveOrRestoreBackground(curObject, false); @@ -182,14 +181,14 @@ void ScreenAnimator::preserveAnyChangedBackgrounds() { } curObject = curObject->nextAnimObject; } - + _screen->_curPage = 0; } void ScreenAnimator::preserveOrRestoreBackground(AnimObject *obj, bool restore) { debugC(9, kDebugLevelAnimator, "ScreenAnimator::preserveOrRestoreBackground(%p, %d)", (const void *)obj, restore); int x = 0, y = 0, width = obj->width, height = obj->height; - + if (restore) { x = obj->x2 >> 3; y = obj->y2; @@ -197,14 +196,14 @@ void ScreenAnimator::preserveOrRestoreBackground(AnimObject *obj, bool restore) x = obj->x1 >> 3; y = obj->y1; } - + if (x < 0) x = 0; if (y < 0) y = 0; - + int temp; - + temp = x + width; if (temp >= 39) x = 39 - width; @@ -234,7 +233,7 @@ void ScreenAnimator::prepDrawAllObjects() { if (curObject->active) { int xpos = curObject->x1; int ypos = curObject->y1; - + int drawLayer = 0; if (!(curObject->flags & 0x800)) drawLayer = 7; @@ -242,7 +241,7 @@ void ScreenAnimator::prepDrawAllObjects() { drawLayer = 0; else drawLayer = _vm->_sprites->getDrawLayer(curObject->drawY); - + // talking head functionallity if (_vm->_talkingCharNum != -1 && (_vm->_currentCharacter->currentAnimFrame != 88 || curObject->index != 0)) { const int16 baseAnimFrameTable1[] = { 0x11, 0x35, 0x59, 0x00, 0x00, 0x00 }; @@ -266,14 +265,14 @@ void ScreenAnimator::prepDrawAllObjects() { } else { temp2 = 1; } - + if (!temp2) shapesIndex = -1; } - + xpos = curObject->x1; ypos = curObject->y1; - + int tempX = 0, tempY = 0; if (curObject->flags & 0x1) { tempX = (xOffsetTable1[curObject->index] * _brandonScaleX) >> 8; @@ -285,22 +284,22 @@ void ScreenAnimator::prepDrawAllObjects() { tempY = (tempY * _brandonScaleY) >> 8; xpos += tempX; ypos += tempY; - + if (_vm->_scaleMode && _brandonScaleX != 256) ++xpos; - + if (curObject->index == 0 && shapesIndex != -1) { if (!(_vm->_brandonStatusBit & 2)) { flagUnk3 = 0x100; if ((flagUnk1 & 0x200) || (flagUnk2 & 0x4000)) flagUnk3 = 0; - + int tempFlags = 0; if (flagUnk3 & 0x100) { tempFlags = curObject->flags & 1; tempFlags |= 0x800 | flagUnk1 | 0x100; } - + if (!(flagUnk3 & 0x100) && (flagUnk2 & 0x4000)) { tempFlags = curObject->flags & 1; tempFlags |= 0x900 | flagUnk1 | 0x4000; @@ -310,7 +309,7 @@ void ScreenAnimator::prepDrawAllObjects() { tempFlags = curObject->flags & 1; tempFlags |= 0x900 | flagUnk1; } - + _screen->drawShape(drawPage, _vm->_shapes[shapesIndex], xpos, ypos, 2, tempFlags | 4, _vm->_brandonPoisonFlagsGFX, int(1), drawLayer, _brandonScaleX, _brandonScaleY); } } @@ -319,25 +318,25 @@ void ScreenAnimator::prepDrawAllObjects() { int tempFlags = 0; if (curObject->flags & 1) tempFlags = 1; - _screen->drawShape(drawPage, _vm->_shapes[shapesIndex], xpos, ypos, 2, tempFlags | 0x800, drawLayer); + _screen->drawShape(drawPage, _vm->_shapes[shapesIndex], xpos, ypos, 2, tempFlags | 0x800, drawLayer); } } } } - + xpos = curObject->x1; ypos = curObject->y1; - + curObject->flags |= 0x800; if (curObject->index == 0) { flagUnk3 = 0x100; - + if (flagUnk1 & 0x200 || flagUnk2 & 0x4000) flagUnk3 = 0; - + if (_vm->_brandonStatusBit & 2) curObject->flags &= 0xFFFFFFFE; - + if (!_vm->_scaleMode) { if (flagUnk3 & 0x100) _screen->drawShape(drawPage, curObject->sceneAnimPtr, xpos, ypos, 2, curObject->flags | flagUnk1 | 0x100, (uint8*)_vm->_brandonPoisonFlagsGFX, int(1), drawLayer); @@ -375,7 +374,7 @@ void ScreenAnimator::copyChangedObjectsForward(int refreshFlag) { ypos = curObject->y1 - curObject->height2; width = curObject->width + (curObject->width2>>3) + 2; height = curObject->height + curObject->height2*2; - + if (xpos < 1) xpos = 1; else if (xpos > 39) @@ -383,7 +382,7 @@ void ScreenAnimator::copyChangedObjectsForward(int refreshFlag) { if (xpos + width > 39) width = 39 - xpos; - + if (ypos < 8) ypos = 8; else if (ypos > 136) @@ -391,7 +390,7 @@ void ScreenAnimator::copyChangedObjectsForward(int refreshFlag) { if (ypos + height > 136) height = 136 - ypos; - + _screen->copyRegion(xpos << 3, ypos, xpos << 3, ypos, width << 3, height, 2, 0, Screen::CR_CLIPPED); curObject->refreshFlag = 0; _updateScreen = true; @@ -416,15 +415,15 @@ void ScreenAnimator::updateAllObjectShapes() { void ScreenAnimator::animRemoveGameItem(int index) { debugC(9, kDebugLevelAnimator, "ScreenAnimator::animRemoveGameItem(%d)", index); restoreAllObjectBackgrounds(); - + AnimObject *animObj = &_items[index]; animObj->sceneAnimPtr = 0; animObj->animFrameNumber = -1; animObj->refreshFlag = 1; - animObj->bkgdChangeFlag = 1; + animObj->bkgdChangeFlag = 1; updateAllObjectShapes(); animObj->active = 0; - + objectRemoveQueue(_objectQueue, animObj); } @@ -459,7 +458,7 @@ void ScreenAnimator::animAddNPC(int character) { restoreAllObjectBackgrounds(); AnimObject *animObj = &_actors[character]; const Character *ch = &_vm->_characterList[character]; - + animObj->active = 1; animObj->refreshFlag = 1; animObj->bkgdChangeFlag = 1; @@ -491,13 +490,13 @@ AnimObject *ScreenAnimator::objectRemoveQueue(AnimObject *queue, AnimObject *rem prev = cur; cur = temp; } - + if (cur == queue) { if (!cur) return 0; return cur->nextAnimObject; } - + if (!cur->nextAnimObject) { if (cur == rem) { if (!prev) @@ -509,7 +508,7 @@ AnimObject *ScreenAnimator::objectRemoveQueue(AnimObject *queue, AnimObject *rem if (cur == rem) prev->nextAnimObject = rem->nextAnimObject; } - + return queue; } @@ -534,7 +533,7 @@ AnimObject *ScreenAnimator::objectQueue(AnimObject *queue, AnimObject *add) { prev = cur; cur = temp; } - + if (add->drawY <= cur->drawY) { prev->nextAnimObject = add; add->nextAnimObject = cur; @@ -617,7 +616,7 @@ void ScreenAnimator::animRefreshNPC(int character) { animObj->flags |= 1; else if (facing >= 5 && facing <= 7) animObj->flags &= 0xFFFFFFFE; - + animObj->drawY = ch->y1; animObj->sceneAnimPtr = _vm->shapes()[ch->currentAnimFrame]; animObj->animFrameNumber = ch->currentAnimFrame; @@ -640,14 +639,14 @@ void ScreenAnimator::animRefreshNPC(int character) { } } } - + int xOffset = _vm->_defaultShapeTable[ch->currentAnimFrame-7].xOffset; int yOffset = _vm->_defaultShapeTable[ch->currentAnimFrame-7].yOffset; - + if (_vm->_scaleMode) { animObj->x1 = ch->x1; animObj->y1 = ch->y1; - + int newScale = _vm->_scaleTable[ch->y1]; _brandonScaleX = newScale; _brandonScaleY = newScale; diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp index 152dc21c61..b9be7edf86 100644 --- a/engines/kyra/debugger.cpp +++ b/engines/kyra/debugger.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/system.h" #include "kyra/debugger.h" @@ -82,7 +82,7 @@ bool Debugger_v1::cmd_enterRoom(int argc, const char **argv) { _vm->_system->hideOverlay(); _vm->_currentCharacter->facing = direction; - + _vm->enterNewScene(room, _vm->_currentCharacter->facing, 0, 0, 1); _vm->_screen->_mouseLockCount = 0; @@ -97,7 +97,7 @@ bool Debugger_v1::cmd_enterRoom(int argc, const char **argv) { bool Debugger_v1::cmd_listRooms(int argc, const char **argv) { for (int i = 0; i < _vm->_roomTableSize; i++) { DebugPrintf("%-3i: %-10s", i, _vm->_roomFilenameTable[_vm->_roomTable[i].nameIndex]); - if (!(i % 8)) + if (!(i % 8)) DebugPrintf("\n"); } DebugPrintf("\n"); @@ -108,7 +108,7 @@ bool Debugger_v1::cmd_listRooms(int argc, const char **argv) { bool Debugger_v1::cmd_listFlags(int argc, const char **argv) { for (int i = 0; i < (int)sizeof(_vm->_flagsTable)*8; i++) { DebugPrintf("(%-3i): %-5i", i, _vm->queryGameFlag(i)); - if (!(i % 10)) + if (!(i % 10)) DebugPrintf("\n"); } DebugPrintf("\n"); @@ -122,7 +122,7 @@ bool Debugger_v1::cmd_toggleFlag(int argc, const char **argv) { _vm->resetGameFlag(flag); else _vm->setGameFlag(flag); - DebugPrintf("Flag %i is now %i\n", flag, _vm->queryGameFlag(flag)); + DebugPrintf("Flag %i is now %i\n", flag, _vm->queryGameFlag(flag)); } else { DebugPrintf("Syntax: toggleflag <flag>\n"); } @@ -133,7 +133,7 @@ bool Debugger_v1::cmd_toggleFlag(int argc, const char **argv) { bool Debugger_v1::cmd_queryFlag(int argc, const char **argv) { if (argc > 1) { uint flag = atoi(argv[1]); - DebugPrintf("Flag %i is %i\n", flag, _vm->queryGameFlag(flag)); + DebugPrintf("Flag %i is %i\n", flag, _vm->queryGameFlag(flag)); } else { DebugPrintf("Syntax: queryflag <flag>\n"); } @@ -152,8 +152,8 @@ bool Debugger_v1::cmd_setTimerCountdown(int argc, const char **argv) { if (argc > 2) { uint timer = atoi(argv[1]); uint countdown = atoi(argv[2]); - _vm->timer()->setCountdown(timer, countdown); - DebugPrintf("Timer %i now has countdown %i\n", timer, _vm->timer()->getDelay(timer)); + _vm->timer()->setCountdown(timer, countdown); + DebugPrintf("Timer %i now has countdown %i\n", timer, _vm->timer()->getDelay(timer)); } else { DebugPrintf("Syntax: settimercountdown <timer> <countdown>\n"); } @@ -176,7 +176,7 @@ bool Debugger_v1::cmd_giveItem(int argc, const char **argv) { } else { DebugPrintf("Syntax: give <itemid>\n"); } - + return true; } } // End of namespace Kyra diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp index 0c2524327e..6fdeaac2a6 100644 --- a/engines/kyra/kyra.cpp +++ b/engines/kyra/kyra.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" @@ -48,15 +48,15 @@ KyraEngine::KyraEngine(OSystem *system, const GameFlags &flags) _staticres = 0; _timer = 0; _scriptInterpreter = 0; - + _flags = flags; _gameSpeed = 60; _tickLength = (uint8)(1000.0 / _gameSpeed); - + _quitFlag = false; - + _skipFlag = false; - + memset(_flagsTable, 0, sizeof(_flagsTable)); // sets up all engine specific debug levels @@ -81,7 +81,7 @@ int KyraEngine::init() { _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); - + // for now we prefer Adlib over native MIDI int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB/* | MDT_PREFER_MIDI*/); @@ -112,7 +112,7 @@ int KyraEngine::init() { // C55 appears to be XMIDI for General MIDI instruments soundMidiPc->setUseC55(_flags.gameID == GI_KYRA2 && !native_mt32); - + // Unlike some SCUMM games, it's not that the MIDI sounds are // missing. It's just that at least at the time of writing they // are decidedly inferior to the Adlib ones. @@ -120,7 +120,7 @@ int KyraEngine::init() { if (midiDriver != MD_ADLIB && ConfMan.getBool("multi_midi")) { SoundAdlibPC *adlib = new SoundAdlibPC(this, _mixer); assert(adlib); - + _sound = new MixedSoundDriver(this, _mixer, soundMidiPc, adlib); assert(_sound); } @@ -138,7 +138,7 @@ int KyraEngine::init() { assert(_timer); _scriptInterpreter = new ScriptHelper(this); assert(_scriptInterpreter); - + setupOpcodeTable(); _lang = 0; diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 32c090dc57..4171e89f5b 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/endian.h" #include "common/file.h" @@ -137,7 +137,7 @@ bool Resource::loadPakFile(const Common::String &filename) { const bool isKyraDat = filename.equalsIgnoreCase("KYRA.DAT"); uint32 size = 0; - + Common::File handle; if (!getFileHandle(filename.c_str(), &size, handle)) { (!isKyraDat ? error : warning)("couldn't load file: '%s'", filename.c_str()); @@ -233,7 +233,7 @@ bool Resource::getFileHandle(const char *file, uint32 *size, Common::File &fileh if ((*start)->getFileHandle(fileHash, filehandle)) { uint32 tSize = (*start)->getFileSize(fileHash); - + if (!tSize) continue; @@ -243,7 +243,7 @@ bool Resource::getFileHandle(const char *file, uint32 *size, Common::File &fileh return true; } } - + return false; } @@ -258,7 +258,7 @@ uint32 Resource::getFileSize(const char *file) const { continue; uint32 size = (*start)->getFileSize(fileHash); - + if (size) return size; } @@ -313,22 +313,22 @@ PAKFile::PAKFile(const char *file, const char *physfile, Common::File &pakfile, PakChunk chunk; uint8 buffer[64]; uint32 nameLength; - + // Move to the position of the next file entry pakfile.seek(pos); - + // Read in the header if (pakfile.read(&buffer, 64) < 5) { warning("PAK file '%s' is corrupted", file); return; } - + // Quit now if we encounter an empty string if (!(*((const char*)buffer))) break; chunk._name = Common::hashit_lower((const char*)buffer); - nameLength = strlen((const char*)buffer) + 1; + nameLength = strlen((const char*)buffer) + 1; if (nameLength > 60) { warning("PAK file '%s' is corrupted", file); @@ -361,7 +361,7 @@ PAKFile::PAKFile(const char *file, const char *physfile, Common::File &pakfile, pos += nameLength + 4; } - _open = true; + _open = true; _filename = Common::hashit_lower(file); _physfile = physfile; _physOffset = off; @@ -506,7 +506,7 @@ bool INSFile::getFileHandle(uint hash, Common::File &filehandle) const { if (file == _files.end()) return false; - if (!filehandle.open(_physfile)) + if (!filehandle.open(_physfile)) return false; filehandle.seek(file->_start, SEEK_CUR); diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 139a7fa72c..96d6a9908e 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -26,7 +26,7 @@ #ifndef KYRA_RESOURCE_H #define KYRA_RESOURCE_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/str.h" #include "common/file.h" @@ -65,7 +65,7 @@ class PAKFile : public ResourceFile { uint _name; uint32 _start; uint32 _size; - + operator uint() const { return _name; } }; @@ -93,7 +93,7 @@ class INSFile : public ResourceFile { uint _name; uint32 _start; uint32 _size; - + operator uint() const { return _name; } }; public: @@ -115,7 +115,7 @@ class Resource { public: Resource(KyraEngine *vm); ~Resource(); - + bool loadPakFile(const Common::String &filename); void unloadPakFile(const Common::String &filename); bool isInPakList(const Common::String &filename) const; @@ -126,7 +126,7 @@ public: // it is possible that the needed file is embedded in the returned handle bool getFileHandle(const char *file, uint32 *size, Common::File &filehandle); - bool loadFileToBuf(const char *file, void *buf, uint32 maxSize); + bool loadFileToBuf(const char *file, void *buf, uint32 maxSize); protected: typedef Common::List<ResourceFile*>::iterator ResIterator; @@ -167,7 +167,7 @@ enum kKyraResources { kRoomList, kCharacterImageFilenames, - + kItemNames, kTakenStrings, kPlacedStrings, @@ -190,7 +190,7 @@ enum kKyraResources { kVeryCleverString, kNewGameString, - + kDefaultShapes, kHealing1Shapes, kHealing2Shapes, @@ -208,10 +208,10 @@ enum kKyraResources { kGUIStrings, kConfigStrings, - + kKyra1TownsSFXTable, kCreditsStrings, - + kMaxResIDs }; @@ -222,7 +222,7 @@ class StaticResource { public: StaticResource(KyraEngine *vm) : _vm(vm), _resList(), _fileLoader(0), _builtIn(0), _filenameTable(0) {} ~StaticResource() { deinit(); } - + static bool checkKyraDat(); bool init(); @@ -259,7 +259,7 @@ private: bool loadShapeTable(const char *filename, void *&ptr, int &size); bool loadRoomTable(const char *filename, void *&ptr, int &size); bool loadPaletteTable(const char *filename, void *&ptr, int &size); - + void freeRawData(void *&ptr, int &size); void freeStringTable(void *&ptr, int &size); void freeShapeTable(void *&ptr, int &size); diff --git a/engines/kyra/saveload_v1.cpp b/engines/kyra/saveload_v1.cpp index e9001968e9..185b13c175 100644 --- a/engines/kyra/saveload_v1.cpp +++ b/engines/kyra/saveload_v1.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "common/savefile.h" #include "common/system.h" @@ -70,7 +69,7 @@ void KyraEngine_v1::loadGame(const char *fileName) { delete in; return; } - + char saveName[31]; in->read(saveName, 31); @@ -129,7 +128,7 @@ void KyraEngine_v1::loadGame(const char *fileName) { _marbleVaseItem = in->readSint16BE(); _itemInHand = in->readByte(); - + for (int i = 0; i < 4; ++i) _birthstoneGemTable[i] = in->readByte(); for (int i = 0; i < 3; ++i) @@ -139,7 +138,7 @@ void KyraEngine_v1::loadGame(const char *fileName) { _cauldronState = in->readByte(); for (int i = 0; i < 2; ++i) _crystalState[i] = in->readByte(); - + _brandonStatusBit = in->readUint16BE(); _brandonStatusBit0x02Flag = in->readByte(); _brandonStatusBit0x20Flag = in->readByte(); @@ -188,7 +187,7 @@ void KyraEngine_v1::loadGame(const char *fileName) { // Version 4 stored settings in the savegame. As of version 5, they are // handled by the config manager. - + if (version == 4) { in->readByte(); // Text speed in->readByte(); // Walk speed @@ -205,7 +204,7 @@ void KyraEngine_v1::loadGame(const char *fileName) { // so if it's out of bounds we just set it to 0. if (_curSfxFile >= _soundFilesTownsCount || _curSfxFile < 0) _curSfxFile = 0; - + if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) _sound->loadSoundFile(_curSfxFile); } @@ -231,7 +230,7 @@ void KyraEngine_v1::loadGame(const char *fileName) { _animator->_noDrawShapesFlag = 1; enterNewScene(_currentCharacter->sceneId, _currentCharacter->facing, 0, 0, 1); _animator->_noDrawShapesFlag = 0; - + _currentCharacter->x1 = brandonX; _currentCharacter->y1 = brandonY; _animator->animRefreshNPC(0); @@ -242,7 +241,7 @@ void KyraEngine_v1::loadGame(const char *fileName) { _screen->copyRegion(8, 8, 8, 8, 304, 128, 2, 0); _screen->_disableScreen = false; _screen->updateScreen(); - + _abortWalkFlag = true; _abortWalkFlag2 = false; _mousePressFlag = false; @@ -295,10 +294,10 @@ void KyraEngine_v1::saveGame(const char *fileName, const char *saveName) { //out->writeUint16BE(_characterList[i].field_20); //out->writeUint16BE(_characterList[i].field_23); } - + out->writeSint16BE(_marbleVaseItem); out->writeByte(_itemInHand); - + for (int i = 0; i < 4; ++i) out->writeByte(_birthstoneGemTable[i]); for (int i = 0; i < 3; ++i) @@ -308,7 +307,7 @@ void KyraEngine_v1::saveGame(const char *fileName, const char *saveName) { out->writeByte(_cauldronState); for (int i = 0; i < 2; ++i) out->writeByte(_crystalState[i]); - + out->writeUint16BE(_brandonStatusBit); out->writeByte(_brandonStatusBit0x02Flag); out->writeByte(_brandonStatusBit0x20Flag); @@ -334,7 +333,7 @@ void KyraEngine_v1::saveGame(const char *fileName, const char *saveName) { } // room table terminator out->writeUint16BE(0xFFFF); - + out->writeSint16BE(_lastMusicCommand); out->writeByte(_curSfxFile); diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index a7e9c90824..b6003ff388 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/system.h" #include "graphics/cursorman.h" @@ -71,7 +71,7 @@ Screen::~Screen() { delete [] _saveLoadPage[i]; _saveLoadPage[i] = 0; } - + for (int i = 0; i < ARRAYSIZE(_saveLoadPageOvl); ++i) { delete [] _saveLoadPageOvl[i]; _saveLoadPageOvl[i] = 0; @@ -79,7 +79,7 @@ Screen::~Screen() { delete [] _unkPtr1; delete [] _unkPtr2; - + delete [] _dirtyRects; } @@ -171,7 +171,7 @@ bool Screen::init() { _animBlockSize = 0; _mouseLockCount = 1; CursorMan.showMouse(false); - + _bitBlitRects = new Rect[BITBLIT_RECTS]; assert(_bitBlitRects); memset(_bitBlitRects, 0, sizeof(Rect)*BITBLIT_RECTS); @@ -185,7 +185,7 @@ bool Screen::init() { _unkPtr2 = new uint8[getRectSize(1, 144)]; assert(_unkPtr2); memset(_unkPtr2, 0, getRectSize(1, 144)); - + _forceFullUpdate = false; _numDirtyRects = 0; _dirtyRects = new Rect[kMaxDirtyRects]; @@ -464,8 +464,8 @@ void Screen::copyToPage0(int y, int h, uint8 page, uint8 *seqBuf) { dstPage += SCREEN_W; } addDirtyRect(0, y, SCREEN_W, h); - // This would remove the text in the end sequence of - // the FM-Towns version. + // This would remove the text in the end sequence of + // the FM-Towns version. // Since this method is just used for the Seqplayer // this shouldn't be a problem anywhere else, so it's // safe to disable the call here. @@ -474,7 +474,7 @@ void Screen::copyToPage0(int y, int h, uint8 page, uint8 *seqBuf) { void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage, int flags) { debugC(9, kDebugLevelScreen, "Screen::copyRegion(%d, %d, %d, %d, %d, %d, %d, %d, %d)", x1, y1, x2, y2, w, h, srcPage, dstPage, flags); - + if (flags & CR_CLIPPED) { if (x2 < 0) { if (x2 <= -w) @@ -505,7 +505,7 @@ void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPag const uint8 *src = getPagePtr(srcPage) + y1 * SCREEN_W + x1; assert(x2 + w <= SCREEN_W && y2 + h <= SCREEN_H); uint8 *dst = getPagePtr(dstPage) + y2 * SCREEN_W + x2; - + if (dstPage == 0 || dstPage == 1) addDirtyRect(x2, y2, w, h); @@ -548,7 +548,7 @@ void Screen::copyPage(uint8 srcPage, uint8 dstPage) { uint8 *dst = getPagePtr(dstPage); memcpy(dst, src, SCREEN_W * SCREEN_H); copyOverlayRegion(0, 0, 0, 0, SCREEN_W, SCREEN_H, srcPage, dstPage); - + if (dstPage == 0 || dstPage == 1) _forceFullUpdate = true; } @@ -556,10 +556,10 @@ void Screen::copyBlockToPage(int pageNum, int x, int y, int w, int h, const uint debugC(9, kDebugLevelScreen, "Screen::copyBlockToPage(%d, %d, %d, %d, %d, %p)", pageNum, x, y, w, h, (const void *)src); assert(x >= 0 && x < Screen::SCREEN_W && y >= 0 && y < Screen::SCREEN_H); uint8 *dst = getPagePtr(pageNum) + y * SCREEN_W + x; - + if (pageNum == 0 || pageNum == 1) addDirtyRect(x, y, w, h); - + clearOverlayRect(pageNum, x, y, w, h); while (h--) { @@ -572,7 +572,7 @@ void Screen::copyBlockToPage(int pageNum, int x, int y, int w, int h, const uint void Screen::copyFromCurPageBlock(int x, int y, int w, int h, const uint8 *src) { debugC(9, kDebugLevelScreen, "Screen::copyFromCurPageBlock(%d, %d, %d, %d, %p)", x, y, w, h, (const void *)src); if (x < 0) - x = 0; + x = 0; else if (x >= 40) return; @@ -588,12 +588,12 @@ void Screen::copyFromCurPageBlock(int x, int y, int w, int h, const uint8 *src) h = 200 - y; uint8 *dst = getPagePtr(_curPage) + y * SCREEN_W + x * 8; - + if (_curPage == 0 || _curPage == 1) addDirtyRect(x*8, y, w*8, h); - + clearOverlayRect(_curPage, x*8, y, w*8, h); - + while (h--) { memcpy(dst, src, w*8); dst += SCREEN_W; @@ -605,7 +605,7 @@ void Screen::copyCurPageBlock(int x, int y, int w, int h, uint8 *dst) { debugC(9, kDebugLevelScreen, "Screen::copyCurPageBlock(%d, %d, %d, %d, %p)", x, y, w, h, (const void *)dst); assert(dst); if (x < 0) - x = 0; + x = 0; else if (x >= 40) return; @@ -640,7 +640,7 @@ void Screen::shuffleScreen(int sx, int sy, int w, int h, int srcPage, int dstPag int i = _vm->_rnd.getRandomNumber(w - 1); SWAP(x_offs[x], x_offs[i]); } - + assert(sy >= 0 && h <= SCREEN_H); int y; uint8 y_offs[SCREEN_H]; @@ -692,12 +692,12 @@ void Screen::fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum) pageNum = _curPage; uint8 *dst = getPagePtr(pageNum) + y1 * SCREEN_W + x1; - + if (pageNum == 0 || pageNum == 1) addDirtyRect(x1, y1, x2-x1+1, y2-y1+1); clearOverlayRect(pageNum, x1, y1, x2-x1+1, y2-y1+1); - + for (; y1 <= y2; ++y1) { memset(dst, color, x2 - x1 + 1); dst += SCREEN_W; @@ -781,7 +781,7 @@ void Screen::drawLine(bool vertical, int x, int y, int length, int color) { assert((x + length) <= SCREEN_W); memset(ptr, color, length); } - + if (_curPage == 0 || _curPage == 1) addDirtyRect(x, y, (vertical) ? 1 : length, (vertical) ? length : 1); @@ -914,11 +914,11 @@ void Screen::printText(const char *str, int x, int y, uint8 color1, uint8 color2 cmap[0] = color2; cmap[1] = color1; setTextColor(cmap, 0, 1); - + Font *fnt = &_fonts[_currentFont]; const uint8 charHeightFnt = *(fnt->fontData + fnt->charSizeOffset + 4); uint8 charHeight = 0; - + if (x < 0) x = 0; else if (x >= SCREEN_W) @@ -982,10 +982,10 @@ void Screen::drawCharANSI(uint8 c, int x, int y) { uint8 charH1 = *(fnt->fontData + fnt->charHeightTableOffset + c * 2); uint8 charH2 = *(fnt->fontData + fnt->charHeightTableOffset + c * 2 + 1); charH0 -= charH1 + charH2; - + const uint8 *src = fnt->fontData + bitmapOffset; const int pitch = SCREEN_W - charWidth; - + while (charH1--) { uint8 col = _textColorsMap[0]; for (int i = 0; i < charWidth; ++i) { @@ -995,7 +995,7 @@ void Screen::drawCharANSI(uint8 c, int x, int y) { } dst += pitch; } - + while (charH2--) { uint8 b = 0; for (int i = 0; i < charWidth; ++i) { @@ -1013,7 +1013,7 @@ void Screen::drawCharANSI(uint8 c, int x, int y) { } dst += pitch; } - + while (charH0--) { uint8 col = _textColorsMap[0]; for (int i = 0; i < charWidth; ++i) { @@ -1023,7 +1023,7 @@ void Screen::drawCharANSI(uint8 c, int x, int y) { } dst += pitch; } - + if (_curPage == 0 || _curPage == 1) addDirtyRect(x, y, charWidth, *(fnt->fontData + fnt->charSizeOffset + 4)); } @@ -1041,7 +1041,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int return; va_list args; va_start(args, flags); - + static int drawShapeVar1 = 0; static int drawShapeVar2[] = { 1, 3, 2, 5, 4, 3, 2, 1 @@ -1049,14 +1049,14 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int static int drawShapeVar3 = 1; static int drawShapeVar4 = 0; static int drawShapeVar5 = 0; - + uint8 *table = 0; int tableLoopCount = 0; int drawLayer = 0; uint8 *table2 = 0; uint8 *table3 = 0; uint8 *table4 = 0; - + if (flags & 0x8000) table2 = va_arg(args, uint8*); @@ -1096,15 +1096,15 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int scale_w = 0x100; scale_h = 0x100; } - + int ppc = (flags >> 8) & 0x3F; - + const uint8 *src = shapeData; if (_vm->gameFlags().useAltShapeHeader) src += 2; uint16 shapeFlags = READ_LE_UINT16(src); src += 2; - + int shapeHeight = *src++; int scaledShapeHeight = (shapeHeight * scale_h) >> 8; if (scaledShapeHeight == 0) { @@ -1123,9 +1123,9 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int x -= scaledShapeWidth >> 1; y -= scaledShapeHeight >> 1; } - + src += 3; - + uint16 frameSize = READ_LE_UINT16(src); src += 2; if ((shapeFlags & 1) || (flags & 0x400)) src += 0x10; @@ -1134,7 +1134,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int decodeFrame4(src, _animBlockPtr, frameSize); src = _animBlockPtr; } - + int shapeSize = shapeWidth * shapeHeight; if (_decodeShapeBufferSize < shapeSize) { delete [] _decodeShapeBuffer; @@ -1149,12 +1149,12 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int } memset(_decodeShapeBuffer, 0, _decodeShapeBufferSize); uint8 *decodedShapeFrame = _decodeShapeBuffer; - + // only used if shapeFlag & 1 is NOT zero const uint8 *colorTable = shapeData + 10; if (_vm->gameFlags().useAltShapeHeader) colorTable += 2; - + for (int j = 0; j < shapeHeight; ++j) { uint8 *dsbNextLine = decodedShapeFrame + shapeWidth; int count = shapeWidth; @@ -1177,7 +1177,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int } decodedShapeFrame = dsbNextLine; } - + uint16 sx1 = _screenDimTable[sd].sx * 8; uint16 sy1 = _screenDimTable[sd].sy; uint16 sx2 = sx1 + _screenDimTable[sd].w * 8; @@ -1186,7 +1186,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int x += sx1; y += sy1; } - + int x1, x2; if (x >= 0) { x1 = 0; @@ -1201,7 +1201,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int if (x2 > sx2) x2 = sx2; } - + int y1, y2; if (y >= 0) { y1 = 0; @@ -1222,7 +1222,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int if (pageNum == 0 || pageNum == 1) addDirtyRect(x, y, x2-x1, y2-y1); clearOverlayRect(pageNum, x, y, x2-x1, y2-y1); - + int scaleYTable[SCREEN_H]; assert(y1 >= 0 && y2 < SCREEN_H); for (y = y1; y < y2; ++y) @@ -1232,13 +1232,13 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int assert(x1 >= 0 && x2 < SCREEN_W); for (x = x1; x < x2; ++x) scaleXTable[x] = (x << 8) / scale_w; - + const uint8 *shapeBuffer = _decodeShapeBuffer; if (flags & DSF_Y_FLIPPED) shapeBuffer += shapeWidth * (shapeHeight - 1); if (flags & DSF_X_FLIPPED) shapeBuffer += shapeWidth - 1; - + for (y = y1; y < y2; ++y) { uint8 *dstNextLine = dst + SCREEN_W; int j = scaleYTable[y]; @@ -1350,7 +1350,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int } } break; - + case 15: case 11: { int offset = dst - dstStart; @@ -1426,7 +1426,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int } } break; - + case 17: { for (int i = 0; i < tableLoopCount; ++i) color = table[color]; @@ -1470,7 +1470,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int } } break; - + case 20: { color = table2[color]; uint8 newColor = table3[color]; @@ -1480,7 +1480,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int } } break; - + case 21: { color = table2[color]; for (int i = 0; i < tableLoopCount; ++i) @@ -1493,7 +1493,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int } } break; - + case 22: { int temp = drawShapeVar4 + drawShapeVar5; if (temp & 0xFF00) { @@ -1517,7 +1517,7 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int } } break; - + case 24: { int offset = dst - dstStart; uint8 pixel = *(_shapePages[0] + offset); @@ -1579,7 +1579,7 @@ uint Screen::decodeFrame4(const uint8 *src, uint8 *dst, uint32 dstSize) { uint8 code = *src++; if (!(code & 0x80)) { // 8th bit isn't set - int len = MIN(count, (code >> 4) + 3); //upper half of code is the length + int len = MIN(count, (code >> 4) + 3); //upper half of code is the length int offs = ((code & 0xF) << 8) | *src++; //lower half of code as byte 2 of offset. const uint8 *dstOffs = dst - offs; while (len--) @@ -1683,7 +1683,7 @@ void Screen::wrapped_decodeFrameDelta(uint8 *dst, const uint8 *src) { void Screen::decodeFrameDeltaPage(uint8 *dst, const uint8 *src, int pitch, bool noXor) { debugC(9, kDebugLevelScreen, "Screen::decodeFrameDeltaPage(%p, %p, %d, %d)", (const void *)dst, (const void *)src, pitch, noXor); - + if (noXor) { wrapped_decodeFrameDeltaPage<true>(dst, src, pitch); } else { @@ -1713,7 +1713,7 @@ void Screen::convertAmigaGfx(uint8 *data, int w, int h, bool offscreen) { *dst4++ = *src++; *dst5++ = *src++; } - + curLine += 40; } } else { @@ -1749,7 +1749,7 @@ void Screen::convertAmigaMsc(uint8 *data) { d = (plane4[i] |= d); d = (plane3[i] |= d); d = (plane2[i] |= d); - d = (plane1[i] |= d); + d = (plane1[i] |= d); } byte dst[320*144]; memset(dst, 0, sizeof(dst)); @@ -1797,7 +1797,7 @@ void Screen::wrapped_decodeFrameDeltaPage(uint8 *dst, const uint8 *src, int pitc code -= 0x80; if (code != 0) { dst += code; - + count += code; while (count >= pitch) { count -= pitch; @@ -1841,14 +1841,14 @@ void Screen::wrapped_decodeFrameDeltaPage(uint8 *dst, const uint8 *src, int pitc } } else { dst += subcode; - + count += subcode; while (count >= pitch) { count -= pitch; dstNext += SCREEN_W; dst = dstNext + count; } - + } } } else { @@ -1882,38 +1882,38 @@ uint8 *Screen::encodeShape(int x, int y, int w, int h, int flags) { while (xpos) { uint8 value = *tmp++; --xpos; - + if (!value) { shapeSize += 2; int16 curX = xpos; bool skip = false; - + while (xpos) { value = *tmp++; --xpos; - + if (value) { skip = true; break; } } - + if (!skip) ++curX; - + curX -= xpos; shapeSize -= curX; - + while (curX > 0xFF) { curX -= 0xFF; shapeSize += 2; } } } - + tmp = start + SCREEN_W; } - + int16 shapeSize2 = shapeSize; if (_vm->gameFlags().useAltShapeHeader) shapeSize += 12; @@ -1922,14 +1922,14 @@ uint8 *Screen::encodeShape(int x, int y, int w, int h, int flags) { if (flags & 1) shapeSize += 16; - - static uint8 table[274]; + + static uint8 table[274]; int tableIndex = 0; - + uint8 *newShape = 0; newShape = new uint8[shapeSize+16]; assert(newShape); - + byte *dst = newShape; if (_vm->gameFlags().useAltShapeHeader) @@ -1948,7 +1948,7 @@ uint8 *Screen::encodeShape(int x, int y, int w, int h, int flags) { memset(table, 0, sizeof(uint8)*274); tableIndex = 1; } - + for (int ypos = h; ypos > 0; --ypos) { uint8 *srcBackUp = src; xpos = w; @@ -1974,7 +1974,7 @@ uint8 *Screen::encodeShape(int x, int y, int w, int h, int flags) { } else { int16 temp = 1; --xpos; - + while (xpos) { if (*src) break; @@ -1982,13 +1982,13 @@ uint8 *Screen::encodeShape(int x, int y, int w, int h, int flags) { ++temp; --xpos; } - + while (temp > 0xFF) { *dst++ = 0; *dst++ = 0xFF; temp -= 0xFF; } - + if (temp & 0xFF) { *dst++ = 0; *dst++ = temp & 0xFF; @@ -1997,7 +1997,7 @@ uint8 *Screen::encodeShape(int x, int y, int w, int h, int flags) { } src = srcBackUp + SCREEN_W; } - + if (!(flags & 2)) { if (shapeSize > _animBlockSize) { dst = newShape; @@ -2018,7 +2018,7 @@ uint8 *Screen::encodeShape(int x, int y, int w, int h, int flags) { uint8 *shapePtrBackUp = src; dst = _animBlockPtr; memcpy(dst, src, shapeSize2); - + int16 size = encodeShapeAndCalculateSize(_animBlockPtr, shapePtrBackUp, shapeSize2); if (size > shapeSize2) { shapeSize -= shapeSize2 - size; @@ -2038,12 +2038,12 @@ uint8 *Screen::encodeShape(int x, int y, int w, int h, int flags) { } } } - + dst = newShape; if (_vm->gameFlags().useAltShapeHeader) dst += 2; WRITE_LE_UINT16((dst + 6), shapeSize); - + if (flags & 1) { dst = newShape + 10; if (_vm->gameFlags().useAltShapeHeader) @@ -2051,7 +2051,7 @@ uint8 *Screen::encodeShape(int x, int y, int w, int h, int flags) { src = &table[0x100]; memcpy(dst, src, sizeof(uint8)*16); } - + return newShape; } @@ -2063,21 +2063,21 @@ int16 Screen::encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size_to) { byte *toPtr = to; byte *fromPtr = from; byte *toPtr2 = to; - + *to++ = 0x81; *to++ = *from++; - + while (from < fromPtrEnd) { byte *curToPtr = to; to = fromPtr; int size = 1; - + while (true) { byte curPixel = *from; if (curPixel == *(from+0x40)) { byte *toBackUp = to; to = from; - + for (int i = 0; i < (fromPtrEnd - from); ++i) { if (*to++ != curPixel) break; @@ -2098,7 +2098,7 @@ int16 Screen::encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size_to) { to = toBackUp; } } - + bool breakLoop = false; while (true) { if ((from - to) == 0) { @@ -2112,7 +2112,7 @@ int16 Screen::encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size_to) { if (*to == curPixel) { if (*(from+size-1) == *(to+size-2)) break; - + byte *fromBackUp = from; byte *toBackUp = to; --to; @@ -2135,11 +2135,11 @@ int16 Screen::encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size_to) { break; } } - + if (breakLoop) break; } - + to = curToPtr; if (size > 2) { uint16 word = 0; @@ -2154,14 +2154,14 @@ int16 Screen::encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size_to) { continue; } } - + if (size > 0x40) { *to++ = 0xFF; WRITE_LE_UINT16(to, size); to += 2; } else { *to++ = ((size & 0xFF) - 3) | 0xC0; } - + word = tempPtr - fromPtr; WRITE_LE_UINT16(to, word); to += 2; from += size; @@ -2171,19 +2171,19 @@ int16 Screen::encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size_to) { toPtr2 = to; *to++ = 0x80; } - + if (*toPtr2 == 0xBF) { toPtr2 = to; *to++ = 0x80; } - + ++(*toPtr2); *to++ = *from++; - skipPixel = true; + skipPixel = true; } } *to++ = 0x80; - + return (to - toPtr); } @@ -2192,12 +2192,12 @@ int Screen::getRectSize(int x, int y) { x = 1; else if (x > 40) x = 40; - + if (y < 1) y = 1; else if (y > 200) y = 200; - + return ((x*y) << 3); } @@ -2280,7 +2280,7 @@ void Screen::copyScreenFromRect(int x, int y, int w, int h, const uint8 *ptr) { src += w; dst += SCREEN_W; } - + addDirtyRect(x, y, w, h); clearOverlayRect(0, x, y, w, h); } @@ -2302,7 +2302,7 @@ uint8 *Screen::getPalette(int num) { assert(num >= 0 && num < (_vm->gameFlags().platform == Common::kPlatformAmiga ? 6 : 4)); if (num == 0) return _currentPalette; - + return _palettes[num-1]; } @@ -2479,30 +2479,30 @@ int Screen::getDrawLayer2(int x, int y, int height) { int xpos = x - 8; int ypos = y - 1; int layer = 1; - + for (int useX = xpos; useX < xpos + 16; ++useX) { for (int useY = ypos - height; useY < ypos; ++useY) { int tempLayer = getShapeFlag2(useX, useY); if (tempLayer > layer) layer = tempLayer; - + if (tempLayer >= 7) return 7; } - } + } return layer; } void Screen::copyBackgroundBlock(int x, int page, int flag) { debugC(9, kDebugLevelScreen, "Screen::copyBackgroundBlock(%d, %d, %d)", x, page, flag); - + if (x < 1) return; - + int height = 128; if (flag) - height += 8; + height += 8; if (!(x & 1)) ++x; if (x == 19) @@ -2512,7 +2512,7 @@ void Screen::copyBackgroundBlock(int x, int page, int flag) { uint8 *ptr2 = _unkPtr2; int oldVideoPage = _curPage; _curPage = page; - + int curX = x; hideMouse(); copyRegionToBuffer(_curPage, 8, 8, 8, height, ptr2); @@ -2542,7 +2542,7 @@ void Screen::copyBackgroundBlock2(int x) { void Screen::shakeScreen(int times) { debugC(9, kDebugLevelScreen, "Screen::shakeScreen(%d)", times); - + while (times--) { // seems to be 1 line (320 pixels) offset in the original // 4 looks more like dosbox though, maybe check this again @@ -2569,7 +2569,7 @@ void Screen::loadBitmap(const char *filename, int tempPage, int dstPage, uint8 * if (palData && palSize) { debugC(9, kDebugLevelMain,"Loading a palette of size %i from %s", palSize, filename); - loadPalette(srcData + 10, palData, palSize); + loadPalette(srcData + 10, palData, palSize); } uint8 *srcPtr = srcData + 10 + palSize; @@ -2655,7 +2655,7 @@ void Screen::addDirtyRect(int x, int y, int w, int h) { _forceFullUpdate = true; return; } - + if (w == 0 || h == 0 || x >= SCREEN_W || y >= SCREEN_H || x + w < 0 || y + h < 0) return; @@ -2674,7 +2674,7 @@ void Screen::addDirtyRect(int x, int y, int w, int h) { if (y + h >= 200) h = 200 - y; - + Rect &cur = _dirtyRects[_numDirtyRects++]; cur.x = x; cur.x2 = w; @@ -2840,7 +2840,7 @@ void Screen::drawCharSJIS(uint16 c, int x, int y) { memset(_sjisTempPage2, 0x80, 324); memset(_sjisSourceChar, 0, 36); memcpy(_sjisSourceChar, _sjisFontData + 0x20 * SJIStoFMTChunk(c & 0xff, c >> 8), 0x20); - + if (_curPage == 0 || _curPage == 1) addDirtyRect(x, y, SJIS_CHARSIZE >> 1, SJIS_CHARSIZE >> 1); @@ -2855,7 +2855,7 @@ void Screen::drawCharSJIS(uint16 c, int x, int y) { destPage += y * 640 + x; uint8 *src = 0, *dst = 0; - + if (color2 != 0x80) { // draw color2 shadow src = _sjisSourceChar; @@ -2866,13 +2866,13 @@ void Screen::drawCharSJIS(uint16 c, int x, int y) { dst += 2; src += 2; *dst++ = 0; } - + src = _sjisTempPage2; dst = _sjisTempPage; memset(dst, 0, 60); for (int i = 0; i < 48; i++) *dst++ |= *src++; - + src = _sjisTempPage2; dst = _sjisTempPage + 3; for (int i = 0; i < 48; i++) @@ -2923,20 +2923,20 @@ void Screen::drawCharSJIS(uint16 c, int x, int y) { if (color2 & 0xff00) { height -= 3; width--; - dst += 0x13; + dst += 0x13; } - + for (int i = 0; i < height; i++) { uint8 rs = *src++; for (int ii = 0; ii < 8; ii++) { if (rs & 0x80) *dst = (color2 & 0xff); - rs <<= 1; + rs <<= 1; dst++; if (!--width) { width = SJIS_CHARSIZE; - if (color2 & 0xff00) { + if (color2 & 0xff00) { width--; dst++; } @@ -2966,28 +2966,28 @@ void Screen::drawCharSJIS(uint16 c, int x, int y) { if (color1 & 0xff00) { height -= 3; width--; - dst += 0x13; + dst += 0x13; } - + for (int i = 0; i < height; i++) { uint8 rs = *src++; for (int ii = 0; ii < 8; ii++) { if (rs & 0x80) *dst = (color1 & 0xff); - rs <<= 1; + rs <<= 1; dst++; if (!--width) { width = SJIS_CHARSIZE; - if (color1 & 0xff00) { + if (color1 & 0xff00) { width--; dst++; } break; } } - } - + } + // copy char to surface src = _sjisTempPage2; dst = destPage; @@ -2997,7 +2997,7 @@ void Screen::drawCharSJIS(uint16 c, int x, int y) { for (int ii = 0; ii < SJIS_CHARSIZE; ii++) { if (*src != 0x80) *dst = *src; - src++; + src++; dst++; } dst += pitch; diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp index 83c75585a8..73fa29a4b9 100644 --- a/engines/kyra/screen_v2.cpp +++ b/engines/kyra/screen_v2.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "kyra/kyra_v2.h" @@ -66,8 +65,8 @@ void Screen_v2::k2IntroFadeToGrey(int delay) { for (int i = 0; i <= 50; ++i) { if (i <= 8 || i >= 30) { - _currentPalette[3 * i + 0] = (_currentPalette[3 * i + 0] + - _currentPalette[3 * i + 1] + + _currentPalette[3 * i + 0] = (_currentPalette[3 * i + 0] + + _currentPalette[3 * i + 1] + _currentPalette[3 * i + 2]) / 3; _currentPalette[3 * i + 1] = _currentPalette[3 * i + 0]; _currentPalette[3 * i + 2] = _currentPalette[3 * i + 0]; @@ -77,8 +76,8 @@ void Screen_v2::k2IntroFadeToGrey(int delay) { // color 71 is the same in both the overview and closeup scenes // Converting it to greyscale makes the trees in the closeup look dull for (int i = 71; i < 200; ++i) { - _currentPalette[3 * i + 0] = (_currentPalette[3 * i + 0] + - _currentPalette[3 * i + 1] + + _currentPalette[3 * i + 0] = (_currentPalette[3 * i + 0] + + _currentPalette[3 * i + 1] + _currentPalette[3 * i + 2]) / 3; _currentPalette[3 * i + 1] = _currentPalette[3 * i + 0]; _currentPalette[3 * i + 2] = _currentPalette[3 * i + 0]; @@ -143,17 +142,17 @@ void Screen_v2::copyWsaRect(int x, int y, int w, int h, int dimState, int plotFu dstPtr += y * SCREEN_W + x; uint8 *dst = dstPtr; - + if (_curPage == 0 || _curPage == 1) addDirtyRect(x, y, w, h); - + clearOverlayRect(_curPage, x, y, w, h); temp = h; while (h--) { src += srcOffset; int cW = w; - + switch (plotFunc) { case 0: memcpy(dst, src, cW); @@ -270,14 +269,14 @@ uint16 Screen_v2::getShapeSize(const uint8 *shp) { uint8 *Screen_v2::makeShapeCopy(const uint8 *src, int index) { debugC(9, kDebugLevelScreen, "Screen_v2::makeShapeCopy(%p, %d)", (const void *)src, index); - + const uint8 *shape = getPtrToShape(src, index); int size = getShapeSize(shape); uint8 *copy = new uint8[size]; assert(copy); memcpy(copy, shape, size); - + return copy; } @@ -290,7 +289,7 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, va_list args; va_start(args, flags); - + static int drawShapeVar1 = 0; static int drawShapeVar2[] = { 1, 3, 2, 5, 4, 3, 2, 1 @@ -298,14 +297,14 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, static int drawShapeVar3 = 1; static int drawShapeVar4 = 0; static int drawShapeVar5 = 0; - + uint8 *table = 0; int tableLoopCount = 0; int drawLayer = 0; const uint8 *table2 = 0; uint8 *table3 = 0; uint8 *table4 = 0; - + if (flags & 0x8000) { table2 = va_arg(args, uint8*); } @@ -340,12 +339,12 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, scale_w = 0x100; scale_h = 0x100; } - + int ppc = (flags >> 8) & 0x3F; - + const uint8 *src = shape; uint16 shapeFlags = READ_LE_UINT16(src); src += 2; - + int shapeHeight = *src++; int scaledShapeHeight = (shapeHeight * scale_h) >> 8; if (scaledShapeHeight == 0) { @@ -364,9 +363,9 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, x -= scaledShapeWidth >> 1; y -= scaledShapeHeight >> 1; } - + src += 3; - + uint16 frameSize = READ_LE_UINT16(src); src += 2; int colorTableColors = 0x10; @@ -383,7 +382,7 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, decodeFrame4(src, _animBlockPtr, frameSize); src = _animBlockPtr; } - + int shapeSize = shapeWidth * shapeHeight; if (_decodeShapeBufferSize < shapeSize) { delete [] _decodeShapeBuffer; @@ -397,7 +396,7 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, } memset(_decodeShapeBuffer, 0, _decodeShapeBufferSize); uint8 *decodedShapeFrame = _decodeShapeBuffer; - + for (int j = 0; j < shapeHeight; ++j) { uint8 *dsbNextLine = decodedShapeFrame + shapeWidth; int count = shapeWidth; @@ -414,7 +413,7 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, } decodedShapeFrame = dsbNextLine; } - + uint16 sx1 = getScreenDim(sd)->sx << 3; uint16 sy1 = getScreenDim(sd)->sy; uint16 sx2 = sx1 + (getScreenDim(sd)->w << 3); @@ -423,7 +422,7 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, x += sx1; y += sy1; } - + int x1, x2; if (x >= 0) { x1 = 0; @@ -440,7 +439,7 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, x2 = sx2; } } - + int y1, y2; if (y >= 0) { y1 = 0; @@ -460,7 +459,7 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, uint8 *dst = getPagePtr(page) + y * 320 + x; uint8 *dstStart = getPagePtr(page); - + int scaleYTable[200]; for (y = y1; y < y2; ++y) { scaleYTable[y] = (y << 8) / scale_h; @@ -469,7 +468,7 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, for (x = x1; x < x2; ++x) { scaleXTable[x] = (x << 8) / scale_w; } - + const uint8 *shapeBuffer = _decodeShapeBuffer; if (flags & 0x02) { shapeBuffer += shapeWidth * (shapeHeight - 1); @@ -477,7 +476,7 @@ void Screen_v2::drawShape(uint8 page, const uint8 *shape, int x, int y, int sd, if (flags & 0x01) { shapeBuffer += shapeWidth - 1; } - + for (y = y1; y < y2; ++y) { uint8 *dstNextLine = dst + 320; int j = scaleYTable[y]; @@ -542,11 +541,11 @@ int Screen_v2::getLayer(int x, int y) { y = 0; else if (y >= 144) y = 143; - + uint8 pixel = *(getCPagePtr(5) + y * 320 + x); pixel &= 0x7F; pixel >>= 3; - + if (pixel < 1) pixel = 1; else if (pixel > 15) diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp index 0778e1abd6..0f8de17174 100644 --- a/engines/kyra/script.cpp +++ b/engines/kyra/script.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/stream.h" #include "common/util.h" @@ -76,13 +76,13 @@ bool ScriptHelper::loadScript(const char *filename, ScriptData *scriptData, cons error("Couldn't open script file '%s'", filename); return false; } - + uint32 formBlockSize = file.getFORMBlockSize(); if (formBlockSize == (uint32)-1) { error("No FORM chunk found in file: '%s'", filename); return false; } - + uint32 chunkSize = file.getIFFBlockSize(TEXT_CHUNK); if (chunkSize != (uint32)-1) { scriptData->text = new byte[chunkSize]; @@ -93,7 +93,7 @@ bool ScriptHelper::loadScript(const char *filename, ScriptData *scriptData, cons return false; } } - + chunkSize = file.getIFFBlockSize(ORDR_CHUNK); if (chunkSize == (uint32)-1) { unloadScript(scriptData); @@ -112,7 +112,7 @@ bool ScriptHelper::loadScript(const char *filename, ScriptData *scriptData, cons while (chunkSize--) scriptData->ordr[chunkSize] = READ_BE_UINT16(&scriptData->ordr[chunkSize]); - + chunkSize = file.getIFFBlockSize(DATA_CHUNK); if (chunkSize == (uint32)-1) { unloadScript(scriptData); @@ -145,8 +145,8 @@ void ScriptHelper::unloadScript(ScriptData *data) { delete [] data->text; delete [] data->ordr; delete [] data->data; - - data->text = 0; + + data->text = 0; data->ordr = data->data = 0; } @@ -187,7 +187,7 @@ bool ScriptHelper::validScript(ScriptState *script) { bool ScriptHelper::runScript(ScriptState *script) { _parameter = 0; _continue = true; - + if (!script->ip) return false; @@ -200,18 +200,18 @@ bool ScriptHelper::runScript(ScriptState *script) { } else if (code & 0x4000) { _parameter = (int8)(code); } else if (code & 0x2000) { - _parameter = *script->ip++; + _parameter = *script->ip++; } else { _parameter = 0; } - + if (opcode > 18) { error("Script unknown command: %d", opcode); } else { debugC(5, kDebugLevelScript, "%s([%d/%u])", _commands[opcode].desc, _parameter, (uint)_parameter); (this->*(_commands[opcode].proc))(script); } - + return _continue; } @@ -221,7 +221,7 @@ bool ScriptHelper::runScript(ScriptState *script) { void ScriptFileParser::setFile(const char *filename, Resource *res) { destroy(); - + if (!res->getFileHandle(filename, &_endOffset, _scriptFile)) return; _startOffset = _scriptFile.pos(); @@ -235,7 +235,7 @@ void ScriptFileParser::destroy() { uint32 ScriptFileParser::getFORMBlockSize() { uint32 oldOffset = _scriptFile.pos(); - + uint32 data = _scriptFile.readUint32LE(); if (data != FORM_CHUNK) { @@ -249,13 +249,13 @@ uint32 ScriptFileParser::getFORMBlockSize() { uint32 ScriptFileParser::getIFFBlockSize(const uint32 chunkName) { uint32 size = (uint32)-1; - + _scriptFile.seek(_startOffset + 0x0C); while (_scriptFile.pos() < _endOffset) { uint32 chunk = _scriptFile.readUint32LE(); uint32 size_temp = _scriptFile.readUint32BE(); - + if (chunk != chunkName) { _scriptFile.seek((size_temp + 1) & (~1), SEEK_CUR); assert(_scriptFile.pos() <= _endOffset); @@ -428,10 +428,10 @@ void ScriptHelper::cmd_negate(ScriptState* script) { void ScriptHelper::cmd_eval(ScriptState* script) { int16 ret = 0; bool error = false; - + int16 val1 = script->stack[script->sp++]; int16 val2 = script->stack[script->sp++]; - + switch (_parameter) { case 0: if (!val2 || !val1) @@ -534,7 +534,7 @@ void ScriptHelper::cmd_eval(ScriptState* script) { error = true; break; } - + if (error) { script->ip = 0; _continue = false; diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp index 7a4f844400..fd0480bb4b 100644 --- a/engines/kyra/script_v1.cpp +++ b/engines/kyra/script_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/system.h" @@ -114,11 +114,11 @@ int KyraEngine_v1::o1_runNPCScript(ScriptState *script) { int KyraEngine_v1::o1_setSpecialExitList(ScriptState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setSpecialExitList(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9)); - + for (int i = 0; i < 10; ++i) _exitList[i] = stackPos(i); _exitListPtr = _exitList; - + return 0; } @@ -167,7 +167,7 @@ int KyraEngine_v1::o1_dropItemInScene(ScriptState *script) { int item = stackPos(0); int xpos = stackPos(1); int ypos = stackPos(2); - + byte freeItem = findFreeItemInScene(_currentCharacter->sceneId); if (freeItem != 0xFF) { int sceneId = _currentCharacter->sceneId; @@ -175,7 +175,7 @@ int KyraEngine_v1::o1_dropItemInScene(ScriptState *script) { room->itemsXPos[freeItem] = xpos; room->itemsYPos[freeItem] = ypos; room->itemsTable[freeItem] = item; - + _animator->animAddGameItem(freeItem, sceneId); _animator->updateAllObjectShapes(); } else { @@ -276,7 +276,7 @@ int KyraEngine_v1::o1_fadeSpecialPalette(ScriptState *script) { } else { warning("KyraEngine_v1::o1fadeSpecialPalette not implemented"); } - } else { + } else { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1fadeSpecialPalette(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); _screen->fadeSpecialPalette(stackPos(0), stackPos(1), stackPos(2), stackPos(3)); } @@ -432,40 +432,40 @@ int KyraEngine_v1::o1_setScaleMode(ScriptState *script) { int KyraEngine_v1::o1_openWSAFile(ScriptState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1openWSAFile(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3)); - + const char *filename = stackPosString(0); int wsaIndex = stackPos(1); - + _movieObjects[wsaIndex]->open(filename, (stackPos(3) != 0) ? 1 : 0, 0); assert(_movieObjects[wsaIndex]->opened()); - + return 0; } int KyraEngine_v1::o1_closeWSAFile(ScriptState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1closeWSAFile(%p) (%d)", (const void *)script, stackPos(0)); - + int wsaIndex = stackPos(0); if (_movieObjects[wsaIndex]) _movieObjects[wsaIndex]->close(); - + return 0; } int KyraEngine_v1::o1_runWSAFromBeginningToEnd(ScriptState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1runWSAFromBeginningToEnd(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); - + _screen->hideMouse(); - + bool running = true; - + int xpos = stackPos(0); int ypos = stackPos(1); int waitTime = stackPos(2); int wsaIndex = stackPos(3); int worldUpdate = stackPos(4); int wsaFrame = 0; - + _movieObjects[wsaIndex]->setX(xpos); _movieObjects[wsaIndex]->setY(ypos); _movieObjects[wsaIndex]->setDrawPage(0); @@ -474,7 +474,7 @@ int KyraEngine_v1::o1_runWSAFromBeginningToEnd(ScriptState *script) { _animator->_updateScreen = true; if (wsaFrame >= _movieObjects[wsaIndex]->frames()) running = false; - + uint32 continueTime = waitTime * _tickLength + _system->getMillis(); while (_system->getMillis() < continueTime) { if (worldUpdate) { @@ -487,9 +487,9 @@ int KyraEngine_v1::o1_runWSAFromBeginningToEnd(ScriptState *script) { delay(10); } } - + _screen->showMouse(); - + return 0; } @@ -577,35 +577,35 @@ int KyraEngine_v1::o1_popBrandonIntoScene(ScriptState *script) { int width = _defaultShapeTable[0].w << 3; int height = _defaultShapeTable[0].h; AnimObject *curAnim = _animator->actors(); - + if (changeScaleMode) { curAnim->x1 = _currentCharacter->x1; curAnim->y1 = _currentCharacter->y1; _animator->_brandonScaleY = _scaleTable[_currentCharacter->y1]; _animator->_brandonScaleX = _animator->_brandonScaleY; - + int animWidth = _animator->fetchAnimWidth(curAnim->sceneAnimPtr, _animator->_brandonScaleX) >> 1; int animHeight = _animator->fetchAnimHeight(curAnim->sceneAnimPtr, _animator->_brandonScaleY); - + animWidth = (xOffset * animWidth) / width; animHeight = (yOffset * animHeight) / height; - + curAnim->x2 = curAnim->x1 += animWidth; curAnim->y2 = curAnim->y1 += animHeight; } else { curAnim->x2 = curAnim->x1 = _currentCharacter->x1 + xOffset; curAnim->y2 = curAnim->y1 = _currentCharacter->y1 + yOffset; } - + int scaleModeBackup = _scaleMode; if (changeScaleMode) _scaleMode = 1; - + _animator->animRefreshNPC(0); _animator->preserveAllBackgrounds(); _animator->prepDrawAllObjects(); _animator->copyChangedObjectsForward(0); - + _scaleMode = scaleModeBackup; return 0; @@ -693,7 +693,7 @@ int KyraEngine_v1::o1_changeCharactersFacing(ScriptState *script) { int character = stackPos(0); int facing = stackPos(1); int newAnimFrame = stackPos(2); - + _animator->restoreAllObjectBackgrounds(); if (newAnimFrame != -1) _characterList[character].currentAnimFrame = newAnimFrame; @@ -702,7 +702,7 @@ int KyraEngine_v1::o1_changeCharactersFacing(ScriptState *script) { _animator->preserveAllBackgrounds(); _animator->prepDrawAllObjects(); _animator->copyChangedObjectsForward(0); - + return 0; } @@ -747,7 +747,7 @@ int KyraEngine_v1::o1_displayWSAFrameOnHidPage(ScriptState *script) { int ypos = stackPos(2); int waitTime = stackPos(3); int wsaIndex = stackPos(4); - + _screen->hideMouse(); uint32 continueTime = waitTime * _tickLength + _system->getMillis(); _movieObjects[wsaIndex]->setX(xpos); @@ -765,7 +765,7 @@ int KyraEngine_v1::o1_displayWSAFrameOnHidPage(ScriptState *script) { delay(10); } _screen->showMouse(); - + return 0; } @@ -841,7 +841,7 @@ int KyraEngine_v1::o1_displayWSASequentialFrames(ScriptState *script) { ++curTime; } _screen->showMouse(); - + return 0; } @@ -906,12 +906,12 @@ int KyraEngine_v1::o1_placeItemInOffScene(ScriptState *script) { int xpos = stackPos(1); int ypos = stackPos(2); int sceneId = stackPos(3); - + byte freeItem = findFreeItemInScene(sceneId); if (freeItem != 0xFF) { assert(sceneId < _roomTableSize); Room *room = &_roomTable[sceneId]; - + room->itemsTable[freeItem] = item; room->itemsXPos[freeItem] = xpos; room->itemsYPos[freeItem] = ypos; @@ -936,7 +936,7 @@ int KyraEngine_v1::o1_placeCharacterInOtherScene(ScriptState *script) { int ypos = (int16)(stackPos(3) & 0xFFFE); int facing = stackPos(4); int animFrame = stackPos(5); - + _characterList[id].sceneId = sceneId; _characterList[id].x1 = _characterList[id].x2 = xpos; _characterList[id].y1 = _characterList[id].y2 = ypos; @@ -965,13 +965,13 @@ int KyraEngine_v1::o1_popMobileNPCIntoScene(ScriptState *script) { int16 xpos = (int16)(stackPos(4) & 0xFFFC); int8 ypos = (int16)(stackPos(5) & 0xFFFE); Character *curChar = &_characterList[character]; - + curChar->sceneId = sceneId; curChar->currentAnimFrame = animFrame; curChar->facing = facing; curChar->x1 = curChar->x2 = xpos; curChar->y1 = curChar->y2 = ypos; - + _animator->animAddNPC(character); _animator->updateAllObjectShapes(); return 0; @@ -1004,7 +1004,7 @@ int KyraEngine_v1::o1_setCharactersLocation(ScriptState *script) { if (_currentCharacter->sceneId != ch->sceneId) animObj->active = 1; } - + ch->sceneId = stackPos(1); return 0; } @@ -1070,10 +1070,10 @@ int KyraEngine_v1::o1_walkCharacterToPoint(ScriptState *script) { forceContinue = true; break; } - + if (forceContinue || !running) continue; - + setCharacterPosition(character, 0); ++curPos; @@ -1298,20 +1298,20 @@ int KyraEngine_v1::o1_makeAmuletAppear(ScriptState *script) { uint32 nextTime = 0; for (int i = 0; _amuleteAnim[i] != 0xFF; ++i) { nextTime = _system->getMillis() + 5 * _tickLength; - + uint8 code = _amuleteAnim[i]; if (code == 3 || code == 7) snd_playSoundEffect(0x71); - + if (code == 5) snd_playSoundEffect(0x72); - + if (code == 14) snd_playSoundEffect(0x73); - + amulet.displayFrame(code); _animator->_updateScreen = true; - + while (_system->getMillis() < nextTime) { _sprites->updateSceneAnims(); _animator->updateAllObjectShapes(); @@ -1367,7 +1367,7 @@ int KyraEngine_v1::o1_waitForConfirmationMouseClick(ScriptState *script) { _animator->updateAllObjectShapes(); delay(10); } - + while (_mousePressFlag) { updateMousePointer(); _sprites->updateSceneAnims(); @@ -1505,7 +1505,7 @@ int KyraEngine_v1::o1_totalItemsInScene(ScriptState *script) { int KyraEngine_v1::o1_restoreBrandonsMovementDelay(ScriptState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1restoreBrandonsMovementDelay(%p) ()", (const void *)script); - setWalkspeed(_configWalkspeed); + setWalkspeed(_configWalkspeed); return 0; } @@ -1564,7 +1564,7 @@ int KyraEngine_v1::o1_fadeEntirePalette(ScriptState *script) { fadePal = _screen->getPalette(2); uint8 *screenPal = _screen->getPalette(0); uint8 *backUpPal = _screen->getPalette(3); - + memcpy(backUpPal, screenPal, sizeof(uint8)*768); memset(fadePal, 0, sizeof(uint8)*768); } else if (cmd == 1) { @@ -1577,7 +1577,7 @@ int KyraEngine_v1::o1_fadeEntirePalette(ScriptState *script) { fadePal = _screen->getPalette(0); } } - + _screen->fadePalette(fadePal, stackPos(1)); return 0; } diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp index 2136c2830d..180a5839f3 100644 --- a/engines/kyra/seqplayer.cpp +++ b/engines/kyra/seqplayer.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "engines/engine.h" @@ -85,7 +85,7 @@ uint8 *SeqPlayer::setPanPages(int pageNum, int shape) { data += offs; uint16 sz = READ_LE_UINT16(data + 6); panPage = new uint8[sz]; - assert(panPage); + assert(panPage); memcpy(panPage, data, sz); } } @@ -97,7 +97,7 @@ void SeqPlayer::makeHandShapes() { _screen->loadBitmap("WRITING.CPS", 3, 3, _screen->_currentPalette); if (_vm->gameFlags().platform == Common::kPlatformMacintosh || _vm->gameFlags().platform == Common::kPlatformAmiga) { freeHandShapes(); - + int pageBackUp = _screen->_curPage; _screen->_curPage = 2; _handShapes[0] = _screen->encodeShape(0, 0, 88, 122, 0); @@ -490,7 +490,7 @@ void SeqPlayer::s1_prefetchVocFile() { bool SeqPlayer::playSequence(const uint8 *seqData, bool skipSeq) { debugC(9, kDebugLevelSequence, "SeqPlayer::seq_playSequence(%p, %d)", (const void *)seqData, skipSeq); assert(seqData); - + static SeqEntry floppySeqProcs[] = { // 0x00 SEQOP(3, s1_wsaOpen), diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 562754b9c5..20a90c2c32 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "kyra/resource.h" #include "kyra/sound.h" @@ -60,7 +60,7 @@ void Sound::voicePlay(const char *file) { _vm->resource()->getFileHandle(filenamebuffer, &fileSize, _compressHandle); if (!_compressHandle.isOpen()) continue; - + Common::MemoryReadStream *tmp = _compressHandle.readStream(fileSize); assert(tmp); _currentVocFile = _supportedCodes[i].streamFunc(tmp, true, 0, 0, 1); @@ -71,7 +71,7 @@ void Sound::voicePlay(const char *file) { if (!found) { strcpy(filenamebuffer, file); strcat(filenamebuffer, ".VOC"); - + fileData = _vm->resource()->fileData(filenamebuffer, &fileSize); if (!fileData) return; @@ -332,7 +332,7 @@ void SoundMidiPC::stopMusic() { _parser = 0; delete [] _parserSource; _parserSource = 0; - + _fadeStartTime = 0; _fadeMusicOut = false; setVolume(255); @@ -366,7 +366,7 @@ void SoundMidiPC::onTimer(void *refCon) { music->_fadeStartTime = 0; music->_fadeMusicOut = false; music->_isPlaying = false; - + music->_eventFromMusic = true; // from sound/midiparser.cpp for (int i = 0; i < 128; ++i) { diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index b6c06b493b..41c11580b3 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -42,7 +42,7 @@ #ifndef KYRA_SOUND_H #define KYRA_SOUND_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/file.h" #include "common/mutex.h" diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index 86f9f718ba..a3953aaf48 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -39,7 +39,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "common/mutex.h" #include "kyra/resource.h" @@ -184,7 +184,7 @@ private: uint8 opLevel2; uint8 opExtraLevel3; uint8 twoChan; - uint8 unk39; + uint8 unk39; uint8 unk40; uint8 spacing1; uint8 durationRandomness; @@ -250,7 +250,7 @@ private: POpcode function; const char *name; }; - + void setupParserOpcodeTable(); const ParserOpcode *_parserOpcodeTable; int _parserOpcodeTableSize; @@ -797,7 +797,7 @@ void AdlibDriver::executePrograms() { } } -// +// void AdlibDriver::resetAdlibState() { debugC(9, kDebugLevelSound, "resetAdlibState()"); @@ -1180,7 +1180,7 @@ void AdlibDriver::primaryEffect2(Channel &channel) { uint16 unk2 = (channel.regAx | (channel.regBx << 8)) & 0x3FF; unk2 += unk1; - + channel.regAx = unk2 & 0xFF; channel.regBx = (channel.regBx & 0xFC) | (unk2 >> 8); @@ -1893,7 +1893,7 @@ void AdlibDriver::setupOpcodeList() { COMMAND(snd_setFlag), COMMAND(snd_clearFlag) }; - + _opcodeList = opcodeList; _opcodesEntries = ARRAYSIZE(opcodeList); } @@ -2013,7 +2013,7 @@ void AdlibDriver::setupParserOpcodeTable() { COMMAND(updateCallback56), COMMAND(update_stopChannel) }; - + _parserOpcodeTable = parserOpcodeTable; _parserOpcodeTableSize = ARRAYSIZE(parserOpcodeTable); } @@ -2281,7 +2281,7 @@ void SoundAdlibPC::playSoundEffect(uint8 track) { void SoundAdlibPC::play(uint8 track) { uint16 soundId = 0; - + if (_v2) soundId = READ_LE_UINT16(&_trackEntries[track<<1]); else diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index dea869d4c0..e0a0c2146b 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "kyra/resource.h" #include "kyra/sound.h" diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp index 1a2c7f6146..be1fd2df7e 100644 --- a/engines/kyra/sprites.cpp +++ b/engines/kyra/sprites.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/stream.h" #include "common/util.h" @@ -87,7 +87,7 @@ void Sprites::setupSceneAnims() { //sceneUnk2[i] = READ_LE_UINT16(data); data += 4; - + _anims[i].x = READ_LE_UINT16(data); data += 4; _anims[i].y = READ_LE_UINT16(data); @@ -216,7 +216,7 @@ void Sprites::updateSceneAnims() { data += 2; debugC(1, kDebugLevelSprites, "func: Set value of unknown animation property to 0"); _anims[i].unk1 = 0; - break; + break; case 0xFF97: data += 2; debugC(6, kDebugLevelSprites, "func: Set default X coordinate of sprite"); @@ -425,7 +425,7 @@ void Sprites::loadDat(const char *filename, SceneExits &exits) { if (_vm->queryGameFlag(0xA0)) memcpy(_screen->getPalette(3), _screen->getPalette(4), 32*3); else - memcpy(_screen->getPalette(3), _screen->getPalette(0), 32*3); + memcpy(_screen->getPalette(3), _screen->getPalette(0), 32*3); } else { if (_vm->queryGameFlag(0xA0)) memcpy(_screen->getPalette(1), _screen->getPalette(3), 768); @@ -446,7 +446,7 @@ void Sprites::loadDat(const char *filename, SceneExits &exits) { while (1) { if (((uint16)(data - _dat) >= fileSize) || (data - start) >= length) - break; + break; if (READ_LE_UINT16(data) == 0xFF83) { //debugC(1, kDebugLevelSprites, "Body section end."); diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 2ffa7aee09..f52c041aa4 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/md5.h" #include "kyra/kyra.h" @@ -41,14 +41,14 @@ bool StaticResource::checkKyraDat() { Common::File kyraDat; if (!kyraDat.open("KYRA.DAT")) return false; - + uint32 size = kyraDat.size() - 16; uint8 digest[16]; kyraDat.seek(size, SEEK_SET); if (kyraDat.read(digest, 16) != 16) return false; kyraDat.close(); - + uint8 digestCalc[16]; if (!Common::md5_file("KYRA.DAT", digestCalc, size)) return false; @@ -183,7 +183,7 @@ bool StaticResource::init() { // GUI strings table { kGUIStrings, kLanguageList, "GUISTRINGS." }, { kConfigStrings, kLanguageList, "CONFIGSTRINGS." }, - + // ROOM table/filenames { Kyra::kRoomList, StaticResource::kRoomList, "ROOM-TABLE.ROOM" }, { kRoomFilenames, kStringList, "ROOM-FILENAMES.TXT" }, @@ -210,7 +210,7 @@ bool StaticResource::init() { // PALETTE table { kPaletteList, kPaletteTable, "1 33 PALTABLE" }, - + // FM-TOWNS specific { kKyra1TownsSFXTable, kRawData, "SFXTABLE" }, { kCreditsStrings, kRawData, "CREDITS" }, @@ -233,14 +233,14 @@ bool StaticResource::init() { warning("no matching INDEX file found"); return false; } - + uint32 version = READ_BE_UINT32(temp); uint32 gameID = READ_BE_UINT32((temp+4)); uint32 featuresValue = READ_BE_UINT32((temp+8)); - + delete [] temp; temp = 0; - + if (version != RESFILE_VERSION) error("invalid KYRA.DAT file version (%d, required %d)", version, RESFILE_VERSION); if (gameID != _vm->game()) @@ -381,7 +381,7 @@ const StaticResource::FileType *StaticResource::getFiletype(int type) { const void *StaticResource::getData(int id, int requesttype, int &size) { const void *ptr = 0; - int type = -1; + int type = -1; size = 0; if (checkResList(id, type, ptr, size)) { @@ -413,7 +413,7 @@ bool StaticResource::loadLanguageTable(const char *filename, void *&ptr, int &si for (int i = 0; languages[i].ext; ++i) { if (languages[i].flags != createLanguage(_vm->gameFlags())) continue; - + strcpy(file, filename); strcat(file, languages[i].ext); if (loadStringTable(file, ptr, size)) @@ -444,7 +444,7 @@ bool StaticResource::loadStringTable(const char *filename, void *&ptr, int &size size = count; char **output = new char*[count]; assert(output); - + const char *curPos = (const char*)src; for (uint32 i = 0; i < count; ++i) { int strLen = strlen(curPos); @@ -477,7 +477,7 @@ bool StaticResource::loadShapeTable(const char *filename, void *&ptr, int &size) size = count; Shape *loadTo = new Shape[count]; assert(loadTo); - + for (uint32 i = 0; i < count; ++i) { loadTo[i].imageIndex = *src++; loadTo[i].x = *src++; @@ -504,7 +504,7 @@ bool StaticResource::loadRoomTable(const char *filename, void *&ptr, int &size) size = count; Room *loadTo = new Room[count]; assert(loadTo); - + for (uint32 i = 0; i < count; ++i) { loadTo[i].nameIndex = *src++; loadTo[i].northExit = READ_BE_UINT16(src); src += 2; @@ -656,9 +656,9 @@ void KyraEngine_v1::initStaticResource() { _veryClever = _staticres->loadStrings(kVeryCleverString, _veryClever_Size); _homeString = _staticres->loadStrings(kOutroHomeString, _homeString_Size); _newGameString = _staticres->loadStrings(kNewGameString, _newGameString_Size); - + _healingShapeTable = _staticres->loadShapeTable(kHealing1Shapes, _healingShapeTableSize); - _healingShape2Table = _staticres->loadShapeTable(kHealing2Shapes, _healingShape2TableSize); + _healingShape2Table = _staticres->loadShapeTable(kHealing2Shapes, _healingShape2TableSize); _posionDeathShapeTable = _staticres->loadShapeTable(kPoisonDeathShapes, _posionDeathShapeTableSize); _fluteAnimShapeTable = _staticres->loadShapeTable(kFluteShapes, _fluteAnimShapeTableSize); _winterScrollTable = _staticres->loadShapeTable(kWinter1Shapes, _winterScrollTableSize); @@ -672,14 +672,14 @@ void KyraEngine_v1::initStaticResource() { _characterImageTable = _staticres->loadStrings(kCharacterImageFilenames, _characterImageTableSize); _roomFilenameTable = _staticres->loadStrings(kRoomFilenames, _roomFilenameTableSize); - + _amuleteAnim = _staticres->loadRawData(kAmuleteAnimSeq, temp); - + _specialPalettes = _staticres->loadPaletteTable(kPaletteList, temp); _guiStrings = _staticres->loadStrings(kGUIStrings, _guiStringsSize); _configStrings = _staticres->loadStrings(kConfigStrings, _configStringsSize); - + // copied static res // room list @@ -729,7 +729,7 @@ void KyraEngine_v1::loadCharacterShapes() { int curImage = 0xFF; int videoPage = _screen->_curPage; _screen->_curPage = 2; - for (int i = 0; i < 115; ++i) { + for (int i = 0; i < 115; ++i) { assert(i < _defaultShapeTableSize); Shape *shape = &_defaultShapeTable[i]; if (shape->imageIndex == 0xFF) { @@ -749,17 +749,17 @@ void KyraEngine_v1::loadCharacterShapes() { void KyraEngine_v1::loadSpecialEffectShapes() { _screen->loadBitmap("EFFECTS.CPS", 3, 3, 0); _screen->_curPage = 2; - - int currShape; + + int currShape; for (currShape = 173; currShape < 183; currShape++) _shapes[currShape] = _screen->encodeShape((currShape-173) * 24, 0, 24, 24, 1); - + for (currShape = 183; currShape < 190; currShape++) _shapes[currShape] = _screen->encodeShape((currShape-183) * 24, 24, 24, 24, 1); - + for (currShape = 190; currShape < 201; currShape++) _shapes[currShape] = _screen->encodeShape((currShape-190) * 24, 48, 24, 24, 1); - + for (currShape = 201; currShape < 206; currShape++) _shapes[currShape] = _screen->encodeShape((currShape-201) * 16, 106, 16, 16, 1); } @@ -835,7 +835,7 @@ void KyraEngine_v1::loadMainScreen(int page) { if (_flags.lang == Common::EN_ANY && !_flags.isTalkie && (_flags.platform == Common::kPlatformPC || _flags.platform == Common::kPlatformAmiga)) _screen->loadBitmap("MAIN15.CPS", page, page, _screen->getPalette(0)); - else if (_flags.lang == Common::EN_ANY || _flags.lang == Common::JA_JPN || (_flags.isTalkie && _flags.lang == Common::IT_ITA)) + else if (_flags.lang == Common::EN_ANY || _flags.lang == Common::JA_JPN || (_flags.isTalkie && _flags.lang == Common::IT_ITA)) _screen->loadBitmap("MAIN_ENG.CPS", page, page, 0); else if (_flags.lang == Common::FR_FRA) _screen->loadBitmap("MAIN_FRE.CPS", page, page, 0); @@ -982,7 +982,7 @@ void KyraEngine_v1::setupButtonData() { &buttonData[14], 0 }; - + _buttonData = buttonData; _buttonDataListPtr = buttonDataListPtr; } @@ -1001,7 +1001,7 @@ Button KyraEngine_v1::_menuButtonData[] = { void KyraEngine_v1::setupMenu() { static Menu menu[] = { - { -1, -1, 208, 136, 248, 249, 250, 0, 251, -1, 8, 0, 5, -1, -1, -1, -1, + { -1, -1, 208, 136, 248, 249, 250, 0, 251, -1, 8, 0, 5, -1, -1, -1, -1, { {1, 0, 0, 0, -1, -1, 30, 148, 15, 252, 253, 24, 0, 248, 249, 250, &KyraEngine_v1::gui_loadGameMenu, -1, 0, 0, 0, 0, 0}, @@ -1030,16 +1030,16 @@ void KyraEngine_v1::setupMenu() { }, { -1, -1, 288, 160, 248, 249, 250, 0, 251, -1, 8, 0, 6, 132, 22, 132, 124, { - {1, 0, 0, 0, -1, 255, 39, 256, 15, 252, 253, 5, 0, + {1, 0, 0, 0, -1, 255, 39, 256, 15, 252, 253, 5, 0, 248, 249, 250, 0, -1, 0, 0, 0, 0, 0}, - {1, 0, 0, 0, -1, 255, 56, 256, 15, 252, 253, 5, 0, + {1, 0, 0, 0, -1, 255, 56, 256, 15, 252, 253, 5, 0, 248, 249, 250, 0, -1, 0, 0, 0, 0, 0}, - {1, 0, 0, 0, -1, 255, 73, 256, 15, 252, 253, 5, 0, + {1, 0, 0, 0, -1, 255, 73, 256, 15, 252, 253, 5, 0, 248, 249, 250, 0, -1, 0, 0, 0, 0, 0}, - {1, 0, 0, 0, -1, 255, 90, 256, 15, 252, 253, 5, 0, + {1, 0, 0, 0, -1, 255, 90, 256, 15, 252, 253, 5, 0, 248, 249, 250, 0, -1, 0, 0, 0, 0, 0}, {1, 0, 0, 0, -1, 255, 107, 256, 15, 252, 253, 5, 0, @@ -1058,7 +1058,7 @@ void KyraEngine_v1::setupMenu() { 248, 249, 250, &KyraEngine_v1::gui_cancelSubMenu, -1, 0, 0, 0, 0, 0} } }, - { -1, -1, 208, 76, 248, 249, 250, 0, 251, -1, 8, 0, 2, -1, -1, -1, -1, + { -1, -1, 208, 76, 248, 249, 250, 0, 251, -1, 8, 0, 2, -1, -1, -1, -1, { {1, 0, 0, 0, -1, -1, 30, 148, 15, 252, 253, 24, 0, 248, 249, 250, &KyraEngine_v1::gui_loadGameMenu, -1, 0, 0, 0, 0, 0}, @@ -1067,7 +1067,7 @@ void KyraEngine_v1::setupMenu() { 248, 249, 250, &KyraEngine_v1::gui_quitPlaying, -1, 0, 0, 0, 0, 0} } }, - { -1, -1, 208, 153, 248, 249, 250, 0, 251, -1, 8, 0, 6, -1, -1, -1, -1, + { -1, -1, 208, 153, 248, 249, 250, 0, 251, -1, 8, 0, 6, -1, -1, -1, -1, { {1, 0, 0, 0, 110, 0, 30, 64, 15, 252, 253, 5, 0, 248, 249, 250, &KyraEngine_v1::gui_controlsChangeMusic, -1, 0, 34, 32, 0, 0}, @@ -1089,7 +1089,7 @@ void KyraEngine_v1::setupMenu() { } } }; - + _menu = menu; } diff --git a/engines/kyra/text.cpp b/engines/kyra/text.cpp index e62410ca19..9428d80725 100644 --- a/engines/kyra/text.cpp +++ b/engines/kyra/text.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "kyra/kyra.h" #include "kyra/screen.h" @@ -76,7 +76,7 @@ int TextDisplayer::getCharLength(const char *str, int len) { if (c >= 0x7F && _vm->gameFlags().lang == Common::JA_JPN) { c = READ_LE_UINT16(str - 1); ++str; - } + } i += _screen->getCharWidth(*str++); ++charsCount; } diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index 16b40cd06e..685a3e5a31 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -31,7 +31,7 @@ // // The jung2.vqa movie does work, but only thanks to a grotesque hack. -#include "common/stdafx.h" + #include "common/events.h" #include "common/system.h" #include "sound/audiostream.h" @@ -273,7 +273,7 @@ bool VQAMovie::open(const char *filename) { // // This is good, because it means we won't have // to worry about the confusing parts of the - // VQA spec, where 8- and 16-bit data have + // VQA spec, where 8- and 16-bit data have // different signedness and stereo sample // layout varies between different games. diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp index 7e9ec9b78b..14b82e5d1d 100644 --- a/engines/kyra/wsamovie.cpp +++ b/engines/kyra/wsamovie.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/system.h" @@ -46,7 +46,7 @@ int WSAMovieV1::open(const char *filename, int offscreenDecode, uint8 *palBuf) { uint8 *p = _vm->resource()->fileData(filename, &fileSize); if (!p) return 0; - + const uint8 *wsaData = p; _numFrames = READ_LE_UINT16(wsaData); wsaData += 2; _width = READ_LE_UINT16(wsaData); wsaData += 2; @@ -55,10 +55,10 @@ int WSAMovieV1::open(const char *filename, int offscreenDecode, uint8 *palBuf) { _offscreenBuffer = NULL; _flags = 0; if (_vm->gameFlags().useAltShapeHeader) { - flags = READ_LE_UINT16(wsaData); + flags = READ_LE_UINT16(wsaData); wsaData += 2; } - + uint32 offsPal = 0; if (flags & 1) { offsPal = 0x300; @@ -66,7 +66,7 @@ int WSAMovieV1::open(const char *filename, int offscreenDecode, uint8 *palBuf) { if (palBuf) memcpy(palBuf, wsaData + (_numFrames + 2) * 4, 0x300); } - + if (offscreenDecode) { _flags |= WF_OFFSCREEN_DECODE; const int offscreenBufferSize = _width * _height; @@ -86,7 +86,7 @@ int WSAMovieV1::open(const char *filename, int offscreenDecode, uint8 *palBuf) { _deltaBuffer = new uint8[_deltaBufferSize]; memset(_deltaBuffer, 0, _deltaBufferSize); - + // read frame offsets _frameOffsTable = new uint32[_numFrames + 2]; _frameOffsTable[0] = 0; @@ -103,22 +103,22 @@ int WSAMovieV1::open(const char *filename, int offscreenDecode, uint8 *palBuf) { _frameOffsTable[i] = READ_LE_UINT32(wsaData) - frameDataOffs; wsaData += 4; } - + // skip palette wsaData += offsPal; - + // read frame data const int frameDataSize = p + fileSize - wsaData; _frameData = new uint8[frameDataSize]; memcpy(_frameData, wsaData, frameDataSize); - + // decode first frame if (firstFrame) Screen::decodeFrame4(_frameData, _deltaBuffer, _deltaBufferSize); - + delete [] p; _opened = true; - + return _numFrames; } @@ -143,7 +143,7 @@ void WSAMovieV1::displayFrame(int frameNum, ...) { dst = _offscreenBuffer; else dst = _vm->screen()->getPageRect(_drawPage, _x, _y, _width, _height); - + if (_currentFrame == _numFrames) { if (!(_flags & WF_NO_FIRST_FRAME)) { if (_flags & WF_OFFSCREEN_DECODE) @@ -171,7 +171,7 @@ void WSAMovieV1::displayFrame(int frameNum, ...) { frameCount = diffCount; } } - + // process if (frameStep > 0) { uint16 cf = _currentFrame; @@ -190,7 +190,7 @@ void WSAMovieV1::displayFrame(int frameNum, ...) { cf += frameStep; } } - + // display _currentFrame = frameNum; if (_flags & WF_OFFSCREEN_DECODE) @@ -223,7 +223,7 @@ int WSAMovieAmiga::open(const char *filename, int offscreenDecode, uint8 *palBuf _buffer = new uint8[_width * _height]; assert(_buffer); - return res; + return res; } void WSAMovieAmiga::close() { @@ -282,7 +282,7 @@ void WSAMovieAmiga::displayFrame(int frameNum, ...) { frameCount = diffCount; } } - + // process if (frameStep > 0) { uint16 cf = _currentFrame; @@ -301,7 +301,7 @@ void WSAMovieAmiga::displayFrame(int frameNum, ...) { cf += frameStep; } } - + // display _currentFrame = frameNum; if (_flags & WF_OFFSCREEN_DECODE) @@ -334,7 +334,7 @@ void WSAMovieAmiga::processFrame(int frameNum, uint8 *dst) { for (int y = 0; y < _height; ++y) { for (int x = 0; x < _width; ++x) - *dst++ ^= *src++; + *dst++ ^= *src++; dst += dstPitch - _width; } } @@ -354,7 +354,7 @@ int WSAMovieV2::open(const char *filename, int unk1, uint8 *palBuf) { warning("couldn't load wsa file: '%s'", filename); return 0; } - + const uint8 *wsaData = p; _numFrames = READ_LE_UINT16(wsaData); wsaData += 2; _xAdd = (int16)(READ_LE_UINT16(wsaData)); wsaData += 2; @@ -365,7 +365,7 @@ int WSAMovieV2::open(const char *filename, int unk1, uint8 *palBuf) { _offscreenBuffer = NULL; _flags = 0; flags = READ_LE_UINT16(wsaData); wsaData += 2; - + uint32 offsPal = 0; if (flags & 1) { offsPal = 0x300; @@ -373,10 +373,10 @@ int WSAMovieV2::open(const char *filename, int unk1, uint8 *palBuf) { if (palBuf) memcpy(palBuf, wsaData + 8 + ((_numFrames << 2) & 0xFFFF), 0x300); } - + if (flags & 2) _flags |= WF_XOR; - + if (!(unk1 & 2)) { _flags |= WF_OFFSCREEN_DECODE; const int offscreenBufferSize = _width * _height; @@ -393,7 +393,7 @@ int WSAMovieV2::open(const char *filename, int unk1, uint8 *palBuf) { _deltaBuffer = new uint8[_deltaBufferSize]; memset(_deltaBuffer, 0, _deltaBufferSize); - + // read frame offsets _frameOffsTable = new uint32[_numFrames + 2]; _frameOffsTable[0] = 0; @@ -402,21 +402,21 @@ int WSAMovieV2::open(const char *filename, int unk1, uint8 *palBuf) { _frameOffsTable[i] = READ_LE_UINT32(wsaData) - frameDataOffs; wsaData += 4; } - + // skip palette wsaData += offsPal; - + // read frame data const int frameDataSize = p + fileSize - wsaData; _frameData = new uint8[frameDataSize]; memcpy(_frameData, wsaData, frameDataSize); - + // decode first frame Screen::decodeFrame4(_frameData, _deltaBuffer, _deltaBufferSize); - + delete [] p; _opened = true; - + return _numFrames; } @@ -430,7 +430,7 @@ void WSAMovieV2::displayFrame(int frameNum, ...) { dst = _offscreenBuffer; else dst = _vm->screen()->getPageRect(_drawPage, _x, _y, _width, _height); - + if (_currentFrame == _numFrames) { if (!(_flags & WF_NO_FIRST_FRAME)) { if (_flags & WF_OFFSCREEN_DECODE) @@ -458,7 +458,7 @@ void WSAMovieV2::displayFrame(int frameNum, ...) { frameCount = diffCount; } } - + // process if (frameStep > 0) { uint16 cf = _currentFrame; @@ -477,7 +477,7 @@ void WSAMovieV2::displayFrame(int frameNum, ...) { cf += frameStep; } } - + // display _currentFrame = frameNum; if (_flags & WF_OFFSCREEN_DECODE) { @@ -494,17 +494,17 @@ void WSAMovieV2::displayFrame(int frameNum, ...) { va_list args; va_start(args, frameNum); - + int copyParam = va_arg(args, int); int plotFunc = (copyParam & 0xFF00) >> 12; int unk1 = copyParam & 0xFF; - + const uint8 *unkPtr1 = va_arg(args, const uint8*); const uint8 *unkPtr2 = va_arg(args, const uint8*); va_end(args); screen->copyWsaRect(_x, _y, _width, _height, 0, plotFunc, _offscreenBuffer, unk1, unkPtr1, unkPtr2); - + screen->_curPage = pageBackUp; } } diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp index 5d1198c360..87c422c641 100644 --- a/engines/lure/debugger.cpp +++ b/engines/lure/debugger.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/endian.h" #include "lure/luredefs.h" @@ -51,12 +51,12 @@ Debugger::Debugger(): GUI::Debugger() { } static int strToInt(const char *s) { - if (!*s) + if (!*s) // No string at all return 0; - else if (strcmp(s, "player") == 0) + else if (strcmp(s, "player") == 0) return PLAYER_ID; - else if (strcmp(s, "ratpouch") == 0) + else if (strcmp(s, "ratpouch") == 0) return RATPOUCH_ID; else if (toupper(s[strlen(s) - 1]) != 'H') // Standard decimal string @@ -93,11 +93,11 @@ bool Debugger::cmd_enterRoom(int argc, const char **argv) { if (argc > 2) { remoteFlag = strToInt(argv[2]); - } + } room.leaveRoom(); room.setRoomNumber(roomNumber); - if (!remoteFlag) + if (!remoteFlag) res.getActiveHotspot(PLAYER_ID)->setRoomNumber(roomNumber); _detach_now = true; @@ -119,10 +119,10 @@ bool Debugger::cmd_listRooms(int argc, const char **argv) { DebugPrintf("Available rooms are:\n"); for (RoomDataList::iterator i = rooms.begin(); i != rooms.end(); ++i) { RoomData *room = *i; - // Explictly note the second drawbridge room as "Alt" - if (room->roomNumber == 49) { + // Explictly note the second drawbridge room as "Alt" + if (room->roomNumber == 49) { strings.getString(47, buffer); - strcat(buffer, " (alt)"); + strcat(buffer, " (alt)"); } else { strings.getString(room->roomNumber, buffer); } @@ -150,7 +150,7 @@ bool Debugger::cmd_listFields(int argc, const char **argv) { for (int ctr = 0; ctr < fields.size(); ++ctr) { DebugPrintf("(%-2d): %-5d", ctr, fields.getField(ctr)); - if (!((ctr + 1) % 7)) + if (!((ctr + 1) % 7)) DebugPrintf("\n"); } DebugPrintf("\n"); @@ -163,7 +163,7 @@ bool Debugger::cmd_setField(int argc, const char **argv) { if (argc >= 3) { int fieldNum = strToInt(argv[1]); uint16 value = strToInt(argv[2]); - + if ((fieldNum < 0) || (fieldNum >= fields.size())) { // Invalid field number DebugPrintf("Invalid field number specified\n"); @@ -188,7 +188,7 @@ bool Debugger::cmd_queryField(int argc, const char **argv) { DebugPrintf("Invalid field number specified\n"); } else { // Get the field value - DebugPrintf("Field %d is %d (%xh)\n", fieldNum, + DebugPrintf("Field %d is %d (%xh)\n", fieldNum, fields.getField(fieldNum), fields.getField(fieldNum)); } } else { @@ -207,7 +207,7 @@ bool Debugger::cmd_giveItem(int argc, const char **argv) { if (argc >= 2) { itemNum = strToInt(argv[1]); - if (argc == 3) + if (argc == 3) charNum = strToInt(argv[2]); itemHotspot = res.getHotspot(itemNum); @@ -236,7 +236,7 @@ bool Debugger::cmd_hotspots(int argc, const char **argv) { StringData &strings = StringData::getReference(); Room &room = Room::getReference(); char buffer[MAX_DESC_SIZE]; - + if (argc > 1) { if (strcmp(argv[1], "active") == 0) { // Loop for displaying active hotspots @@ -288,7 +288,7 @@ bool Debugger::cmd_hotspot(int argc, const char **argv) { if (argc < 2) { DebugPrintf("hotspot <hotspot_id> ['paths' | 'schedule' | 'actions' | 'activate' | 'deactivate']\n"); return true; - } + } hs = res.getHotspot(strToInt(argv[1])); if (!hs) { DebugPrintf("Unknown hotspot specified\n"); @@ -299,22 +299,22 @@ bool Debugger::cmd_hotspot(int argc, const char **argv) { if (argc == 2) { // Show the hotspot properties strings.getString(hs->nameId, buffer); - DebugPrintf("name = %d - %s, descs = (%d,%d)\n", hs->nameId, buffer, + DebugPrintf("name = %d - %s, descs = (%d,%d)\n", hs->nameId, buffer, hs->descId, hs->descId2); DebugPrintf("actions = %xh, offset = %xh\n", hs->actions, hs->actionsOffset); DebugPrintf("flags = %xh, layer = %d\n", hs->flags, hs->layer); DebugPrintf("position = %d,%d,%d\n", hs->startX, hs->startY, hs->roomNumber); - DebugPrintf("size = %d,%d, alt = %d,%d, yCorrection = %d\n", + DebugPrintf("size = %d,%d, alt = %d,%d, yCorrection = %d\n", hs->width, hs->height, hs->widthCopy, hs->heightCopy, hs->yCorrection); DebugPrintf("Talk bubble offset = %d,%d\n", hs->talkX, hs->talkY); DebugPrintf("load offset = %xh, script load = %d\n", hs->loadOffset, hs->scriptLoadFlag); DebugPrintf("Animation Id = %xh, Colour offset = %d\n", hs->animRecordId, hs->colourOffset); - DebugPrintf("Talk Script offset = %xh, Tick Script offset = %xh\n", + DebugPrintf("Talk Script offset = %xh, Tick Script offset = %xh\n", hs->talkScriptOffset, hs->tickScriptOffset); DebugPrintf("Tick Proc offset = %xh\n", hs->tickProcOffset); DebugPrintf("Tick timeout = %d\n", hs->tickTimeout); DebugPrintf("NPC Shcedule = %xh\n", hs->npcSchedule); - DebugPrintf("Character mode = %d, delay ctr = %d, pause ctr = %d\n", + DebugPrintf("Character mode = %d, delay ctr = %d, pause ctr = %d\n", hs->characterMode, hs->delayCtr, hs->pauseCtr); if (h != NULL) { @@ -347,13 +347,13 @@ bool Debugger::cmd_hotspot(int argc, const char **argv) { DebugPrintf("Deactivated\n"); } else { - if (!h) + if (!h) DebugPrintf("The specified hotspot is not currently active\n"); else if (strcmp(argv[2], "paths") == 0) { // List any paths for a charcter h->pathFinder().list(buffer); DebugPrintf("%s", buffer); - } + } else if (strcmp(argv[2], "schedule") == 0) { // List any current schedule for the character h->currentActions().list(buffer); @@ -365,7 +365,7 @@ bool Debugger::cmd_hotspot(int argc, const char **argv) { DebugPrintf("Record Id = %xh\n", pData.animRecordId); DebugPrintf("Flags = %d\n", pData.flags); DebugPrintf("Frames: up=%d down=%d left=%d right=%d\n", - pData.upFrame, pData.downFrame, pData.leftFrame, pData.rightFrame); + pData.upFrame, pData.downFrame, pData.leftFrame, pData.rightFrame); DebugPrintf("Current frame = %d of %d\n", h->frameNumber(), h->numFrames()); } } @@ -384,7 +384,7 @@ bool Debugger::cmd_room(int argc, const char **argv) { if (argc < 2) { DebugPrintf("room <room_number>\n"); return true; - } + } int roomNumber = strToInt(argv[1]); RoomData *room = res.getRoom(roomNumber); if (!room) { @@ -398,8 +398,8 @@ bool Debugger::cmd_room(int argc, const char **argv) { strings.getString(room->descId, buffer); DebugPrintf("%s\n", buffer); DebugPrintf("Horizontal clipping = %d->%d walk area=(%d,%d)-(%d,%d)\n", - room->clippingXStart, room->clippingXEnd, - room->walkBounds.left, room->walkBounds.top, + room->clippingXStart, room->clippingXEnd, + room->walkBounds.left, room->walkBounds.top, room->walkBounds.right, room->walkBounds.bottom); DebugPrintf("Exit hotspots:"); @@ -410,7 +410,7 @@ bool Debugger::cmd_room(int argc, const char **argv) { RoomExitHotspotList::iterator i; for (i = exits.begin(); i != exits.end(); ++i) { RoomExitHotspotData *rec = *i; - + DebugPrintf("\nArea - (%d,%d)-(%d,%d) Room=%d Cursor=%d Hotspot=%xh", rec->xs, rec->ys, rec->xe, rec->ye, rec->destRoomNumber, rec->cursorNum, rec->hotspotId); } @@ -419,7 +419,7 @@ bool Debugger::cmd_room(int argc, const char **argv) { } DebugPrintf("Room exits:"); - if (room->exits.empty()) + if (room->exits.empty()) DebugPrintf(" none\n"); else { RoomExitList::iterator i2; @@ -427,7 +427,7 @@ bool Debugger::cmd_room(int argc, const char **argv) { RoomExitData *rec2 = *i2; DebugPrintf("\nExit - (%d,%d)-(%d,%d) Dest=%d,(%d,%d) Dir=%s Sequence=%xh", - rec2->xs, rec2->ys, rec2->xe, rec2->ye, rec2->roomNumber, + rec2->xs, rec2->ys, rec2->xe, rec2->ye, rec2->roomNumber, rec2->x, rec2->y, directionList[rec2->direction], rec2->sequenceOffset); } @@ -455,7 +455,7 @@ bool Debugger::cmd_showAnim(int argc, const char **argv) { // Figure out the total size of the animation - this will be used for guestimating // frame sizes, or validating that a specified frame size is correct MemoryBlock *src = Disk::getReference().getEntry(data->animId); - + int numFrames = READ_LE_UINT16(src->data()); uint16 *headerEntry = (uint16 *) (src->data() + 2); assert((numFrames >= 1) && (numFrames < 100)); @@ -498,9 +498,9 @@ bool Debugger::cmd_showAnim(int argc, const char **argv) { destSize, width, height, numFrames, width * height * numFrames / 2); } } else { - // Guestimate a frame size + // Guestimate a frame size frameSize = destSize / numFrames; - + // Figure out the approximate starting point of a width 3/4 the frame size width = frameSize * 3 / 4; @@ -509,7 +509,7 @@ bool Debugger::cmd_showAnim(int argc, const char **argv) { while ((width > 0) && (descFlag || (((frameSize * 2) % width) != 0))) { if (((frameSize * 2) % width) == 0) - DebugPrintf("Frame size (%d,%d) found\n", width, frameSize * 2 / width); + DebugPrintf("Frame size (%d,%d) found\n", width, frameSize * 2 / width); --width; } @@ -520,14 +520,14 @@ bool Debugger::cmd_showAnim(int argc, const char **argv) { DebugPrintf("Total size = %d, # frames = %d, frame Size = %d - No valid frame dimensions\n", destSize, numFrames, frameSize); return true; - } + } height = (frameSize * 2) / width; DebugPrintf("# frames = %d, guestimated frame size = (%d,%d)\n", numFrames, width, height); } - // Bottle object is used as a handy hotspot holder that doesn't have any + // Bottle object is used as a handy hotspot holder that doesn't have any // tick proc behaviour that we need to worry about Hotspot *hotspot = res.activateHotspot(BOTTLE_HOTSPOT_ID); hotspot->setLayer(0xfe); diff --git a/engines/lure/decode.h b/engines/lure/decode.h index 8e4e87a07d..ff83ba6454 100644 --- a/engines/lure/decode.h +++ b/engines/lure/decode.h @@ -26,7 +26,7 @@ #ifndef LURE_DECODE_H #define LURE_DECODE_H -#include "common/stdafx.h" + #include "lure/luredefs.h" #include "lure/memory.h" @@ -56,7 +56,7 @@ class AnimationDecoder { public: static void rcl(uint16 &value, bool &carry); static uint32 decode_data(MemoryBlock *src, MemoryBlock *dest, uint32 srcPos); - static void decode_data_2(byte *&pSrc, uint16 &currData, uint16 &bitCtr, + static void decode_data_2(byte *&pSrc, uint16 &currData, uint16 &bitCtr, uint16 &dx, bool &carry); }; diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index 4291b9aedb..3fa6278016 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "base/plugins.h" #include "common/advancedDetector.h" @@ -121,7 +119,7 @@ GameList Engine_LURE_detectGames(const FSList &fslist) { printf("Your game version appears to be unknown. Please, report the following\n"); printf("data to the ScummVM team along with name of the game you tried to add\n"); printf("and its version/language/etc.:\n"); - + printf(" LURE MD5 '%s'\n\n", md5str); const PlainGameDescriptor *g1 = lure_list; @@ -174,11 +172,11 @@ void LureEngine::detectGame() { error("Error validating %s - file is invalid or out of date", SUPPORT_FILENAME); else if ((version.vMajor != LURE_DAT_MAJOR) || (version.vMinor != LURE_DAT_MINOR)) error("Incorrect version of %s file - expected %d.%d but got %d.%d", - SUPPORT_FILENAME, LURE_DAT_MAJOR, LURE_DAT_MINOR, + SUPPORT_FILENAME, LURE_DAT_MAJOR, LURE_DAT_MINOR, version.vMajor, version.vMinor); } - // Do an md5 check + // Do an md5 check char md5str[32 + 1]; const GameSettings *g; diff --git a/engines/lure/disk.cpp b/engines/lure/disk.cpp index b5465df8d9..d1a7239c4c 100644 --- a/engines/lure/disk.cpp +++ b/engines/lure/disk.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/file.h" #include "common/util.h" @@ -64,9 +64,9 @@ uint8 Disk::indexOf(uint16 id, bool suppressError) { if (_entries[entryIndex].id == HEADER_ENTRY_UNUSED_ID) break; else if (_entries[entryIndex].id == id) return entryIndex; } - + if (suppressError) return 0xff; - if (_fileNum == 0) + if (_fileNum == 0) error("Could not find entry Id #%d in file %s", id, SUPPORT_FILENAME); else error("Could not find entry Id #%d in file disk%d.vga", id, _fileNum); @@ -79,16 +79,16 @@ void Disk::openFile(uint8 fileNum) { // Only load up the new file if the current file number has changed if (fileNum == _fileNum) return; - + // Delete any existing open file handle - if (_fileNum != 0xff) delete _fileHandle; + if (_fileNum != 0xff) delete _fileHandle; _fileNum = fileNum; - + // Open up the the new file _fileHandle = new Common::File(); char sFilename[10]; - if (_fileNum == 0) + if (_fileNum == 0) strcpy(sFilename, SUPPORT_FILENAME); else sprintf(sFilename, "disk%d.vga", _fileNum); @@ -155,7 +155,7 @@ MemoryBlock *Disk::getEntry(uint16 id) { // Get the index of the resource, if necessary opening the correct file uint8 index = indexOf(id); - + // Calculate the offset and size of the entry uint32 size = (uint32) _entries[index].size; if (_entries[index].sizeExtension) size += 0x10000; @@ -180,7 +180,7 @@ uint8 Disk::numEntries() { // Figure out how many entries there are by count until an unused entry is found for (byte entryIndex = 0; entryIndex < NUM_ENTRIES_IN_HEADER; ++entryIndex) if (_entries[entryIndex].id == HEADER_ENTRY_UNUSED_ID) return entryIndex; - + return NUM_ENTRIES_IN_HEADER; } diff --git a/engines/lure/disk.h b/engines/lure/disk.h index 47ff7901c5..5e5717112c 100644 --- a/engines/lure/disk.h +++ b/engines/lure/disk.h @@ -26,7 +26,7 @@ #ifndef LURE_DISK_H #define LURE_DISK_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/str.h" #include "lure/memory.h" diff --git a/engines/lure/events.cpp b/engines/lure/events.cpp index 055bfac49c..68dc808392 100644 --- a/engines/lure/events.cpp +++ b/engines/lure/events.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/events.h" #include "graphics/cursorman.h" @@ -35,14 +35,14 @@ namespace Lure { static Mouse *int_mouse = NULL; -Mouse &Mouse::getReference() { - return *int_mouse; +Mouse &Mouse::getReference() { + return *int_mouse; } Mouse::Mouse() { int_mouse = this; - _lButton = false; + _lButton = false; _rButton = false; _cursorNum = CURSOR_ARROW; _x = 0; @@ -87,7 +87,7 @@ void Mouse::cursorOff() { void Mouse::setCursorNum(CursorType cursorNum) { int hotspotX = 7, hotspotY = 7; if ((cursorNum == CURSOR_ARROW) || (cursorNum == CURSOR_MENUBAR)) { - hotspotX = 0; + hotspotX = 0; hotspotY = 0; } @@ -105,7 +105,7 @@ void Mouse::setCursorNum(CursorType cursorNum, int hotspotX, int hotspotY) { void Mouse::pushCursorNum(CursorType cursorNum) { int hotspotX = 7, hotspotY = 7; if ((cursorNum == CURSOR_ARROW) || (cursorNum == CURSOR_MENUBAR)) { - hotspotX = 0; + hotspotX = 0; hotspotY = 0; } @@ -186,7 +186,7 @@ void Events::waitForPress() { else if ((_event.type == Common::EVENT_LBUTTONDOWN) || (_event.type == Common::EVENT_RBUTTONDOWN)) { keyButton = true; - Mouse::getReference().waitForRelease(); + Mouse::getReference().waitForRelease(); } } g_system->delayMillis(20); @@ -205,7 +205,7 @@ bool Events::interruptableDelay(uint32 milliseconds) { if (events.quitFlag) return true; if (events.pollEvent()) { - if (events.type() == Common::EVENT_KEYDOWN) + if (events.type() == Common::EVENT_KEYDOWN) return events.event().kbd.keycode == 27; else if (events.type() == Common::EVENT_LBUTTONDOWN) return false; diff --git a/engines/lure/events.h b/engines/lure/events.h index 1205ebe158..fa054da949 100644 --- a/engines/lure/events.h +++ b/engines/lure/events.h @@ -26,7 +26,7 @@ #ifndef LURE_EVENTS_H #define LURE_EVENTS_H -#include "common/stdafx.h" + #include "common/events.h" #include "common/str.h" #include "lure/luredefs.h" @@ -42,7 +42,7 @@ private: public: Mouse(); ~Mouse(); - static Mouse &getReference(); + static Mouse &getReference(); void handleEvent(Common::Event event); void cursorOn(); @@ -57,7 +57,7 @@ public: bool rButton() { return _rButton; } void waitForRelease(); void pushCursorNum(CursorType cursorNum); - void pushCursorNum(CursorType cursorNum, int hotspotX, int hotspotY); + void pushCursorNum(CursorType cursorNum, int hotspotX, int hotspotY); void popCursor(); }; diff --git a/engines/lure/game.h b/engines/lure/game.h index 50b730e354..8afbe1691b 100644 --- a/engines/lure/game.h +++ b/engines/lure/game.h @@ -26,7 +26,7 @@ #ifndef LURE_GAME_H #define LURE_GAME_H -#include "common/stdafx.h" + #include "engines/engine.h" #include "lure/luredefs.h" #include "lure/menu.h" diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp index ada8f5081b..6aeb05967f 100644 --- a/engines/lure/lure.cpp +++ b/engines/lure/lure.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/system.h" @@ -56,7 +56,7 @@ LureEngine::LureEngine(OSystem *system): Engine(system) { _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); - + _features = 0; _game = 0; } @@ -178,7 +178,7 @@ bool LureEngine::loadGame(uint8 slotNumber) { return false; } - // Check language version + // Check language version uint8 language = f->readByte(); uint8 version = f->readByte(); if ((language != _language) || (version != LURE_DAT_MINOR)) { @@ -209,7 +209,7 @@ Common::String *LureEngine::detectSave(int slotNumber) { char buffer[5]; f->read(&buffer[0], 5); if (memcmp(&buffer[0], "lure", 5) == 0) { - // Check language version + // Check language version uint8 language = f->readByte(); uint8 version = f->readByte(); if ((language == _language) && (version == LURE_DAT_MINOR)) { diff --git a/engines/lure/luredefs.h b/engines/lure/luredefs.h index ef48f6f452..091ea7284e 100644 --- a/engines/lure/luredefs.h +++ b/engines/lure/luredefs.h @@ -26,7 +26,7 @@ #ifndef LUREDEFS_H #define LUREDEFS_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/list.h" @@ -89,18 +89,18 @@ enum Action { RETURN = 23, BRIBE = 24, EXAMINE = 25, - NPC_SET_ROOM_AND_OFFSET = 28, - NPC_TALK_TO_PLAYER = 29, - NPC_EXEC_SCRIPT = 30, + NPC_SET_ROOM_AND_OFFSET = 28, + NPC_TALK_TO_PLAYER = 29, + NPC_EXEC_SCRIPT = 30, NPC_RESET_PAUSED_LIST = 31, - NPC_SET_RAND_DEST = 32, - NPC_WALKING_CHECK = 33, + NPC_SET_RAND_DEST = 32, + NPC_WALKING_CHECK = 33, NPC_SET_SUPPORT_OFFSET = 34, - NPC_SUPPORT_OFFSET_COND = 35, - NPC_DISPATCH_ACTION = 36, + NPC_SUPPORT_OFFSET_COND = 35, + NPC_DISPATCH_ACTION = 36, NPC_TALK_NPC_TO_NPC = 37, - NPC_PAUSE = 38, - NPC_START_TALKING = 39, + NPC_PAUSE = 38, + NPC_START_TALKING = 39, NPC_JUMP_ADDRESS = 40 }; @@ -153,7 +153,7 @@ enum Action { enum CursorType {CURSOR_ARROW = 0, CURSOR_DISK = 1, CURSOR_TIME_START = 2, CURSOR_TIME_END = 9, CURSOR_CROSS = 10, CURSOR_UP_ARROW = 11, CURSOR_DOWN_ARROW = 12, CURSOR_LEFT_ARROW = 13, CURSOR_RIGHT_ARROW = 14, CURSOR_CAMERA = 15, CURSOR_TALK = 16, - CURSOR_MENUBAR = 17, CURSOR_FIGHT_UPPER = 23, CURSOR_FIGHT_MIDDLE = 24, + CURSOR_MENUBAR = 17, CURSOR_FIGHT_UPPER = 23, CURSOR_FIGHT_MIDDLE = 24, CURSOR_FIGHT_LOWER = 25}; // Font details @@ -168,12 +168,12 @@ enum CursorType {CURSOR_ARROW = 0, CURSOR_DISK = 1, CURSOR_TIME_START = 2, #define MENU_UNSELECTED_COLOUR 0xe2 #define MENU_SELECTED_COLOUR 0xe3 #define MENUITEM_NONE 0 -#define MENUITEM_CREDITS 1 -#define MENUITEM_RESTART_GAME 2 -#define MENUITEM_SAVE_GAME 3 -#define MENUITEM_RESTORE_GAME 4 -#define MENUITEM_QUIT 5 -#define MENUITEM_TEXT_SPEED 6 +#define MENUITEM_CREDITS 1 +#define MENUITEM_RESTART_GAME 2 +#define MENUITEM_SAVE_GAME 3 +#define MENUITEM_RESTORE_GAME 4 +#define MENUITEM_QUIT 5 +#define MENUITEM_TEXT_SPEED 6 #define MENUITEM_SOUND 7 // Mouse change needed to change an item in a popup menu @@ -264,7 +264,7 @@ enum CursorType {CURSOR_ARROW = 0, CURSOR_DISK = 1, CURSOR_TIME_START = 2, #define GAME_TICK_DELAY 20 // Tick proc constants -#define STANDARD_CHARACTER_TICK_PROC 0x4f82 +#define STANDARD_CHARACTER_TICK_PROC 0x4f82 #define PLAYER_TICK_PROC_ID 0x5E44 #define VOICE_TICK_PROC_ID 0x625E #define PUZZLED_TICK_PROC_ID 0x6571 diff --git a/engines/lure/memory.h b/engines/lure/memory.h index 0bbefadec7..bdd9597c5e 100644 --- a/engines/lure/memory.h +++ b/engines/lure/memory.h @@ -26,7 +26,7 @@ #ifndef LURE_MEMORY_H #define LURE_MEMORY_H -#include "common/stdafx.h" + #include "common/system.h" #include "common/str.h" diff --git a/engines/lure/menu.h b/engines/lure/menu.h index 587074e8af..4f0b3297ed 100644 --- a/engines/lure/menu.h +++ b/engines/lure/menu.h @@ -26,7 +26,7 @@ #ifndef LURE_MENU_H #define LURE_MENU_H -#include "common/stdafx.h" + #include "common/str.h" #include "lure/luredefs.h" #include "lure/disk.h" @@ -45,8 +45,8 @@ private: const char **_entries; uint8 _numEntries; public: - MenuRecord(uint16 hsxstartVal, uint16 hsxendVal, uint16 xstartVal, uint16 widthVal, - int numParams, ...); + MenuRecord(uint16 hsxstartVal, uint16 hsxendVal, uint16 xstartVal, uint16 widthVal, + int numParams, ...); uint16 xstart() { return _xstart; } uint16 width() { return _width; } @@ -66,7 +66,7 @@ private: uint8 _selectedIndex; MenuRecord *getMenuAt(int x); - uint8 getIndexAt(uint16 x, uint16 y); + uint8 getIndexAt(uint16 x, uint16 y); void toggleHighlight(MenuRecord *menuRec); void toggleHighlightItem(uint8 index); public: diff --git a/engines/lure/room.h b/engines/lure/room.h index 6c5dfc6747..b97df2f46a 100644 --- a/engines/lure/room.h +++ b/engines/lure/room.h @@ -26,7 +26,7 @@ #ifndef LURE_ROOM_H #define LURE_ROOM_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "lure/disk.h" #include "lure/res.h" @@ -49,7 +49,7 @@ private: bool _cells[FULL_VERT_RECTS][FULL_HORIZ_RECTS]; public: RoomLayer(uint16 screenId, bool backgroundLayer); - bool isOccupied(byte cellX, byte cellY) { + bool isOccupied(byte cellX, byte cellY) { return _cells[cellY][cellX]; } }; @@ -90,7 +90,7 @@ public: Room(); ~Room(); static Room &getReference(); - + void update(); void nextFrame(); void checkCursor(); diff --git a/engines/lure/screen.h b/engines/lure/screen.h index 90db7ee314..9714405ea3 100644 --- a/engines/lure/screen.h +++ b/engines/lure/screen.h @@ -26,7 +26,7 @@ #ifndef LURE_SCREEN_H #define LURE_SCREEN_H -#include "common/stdafx.h" + #include "engines/engine.h" #include "lure/luredefs.h" #include "lure/palette.h" diff --git a/engines/lure/surface.h b/engines/lure/surface.h index 564f65dd99..4fd27a4c38 100644 --- a/engines/lure/surface.h +++ b/engines/lure/surface.h @@ -26,7 +26,7 @@ #ifndef LURE_SURFACE_H #define LURE_SURFACE_H -#include "common/stdafx.h" + #include "common/str.h" #include "lure/disk.h" #include "lure/luredefs.h" @@ -37,13 +37,13 @@ namespace Lure { class Surface { private: - MemoryBlock *_data; + MemoryBlock *_data; uint16 _width, _height; public: Surface(MemoryBlock *src, uint16 width, uint16 height); - Surface(uint16 width, uint16 height); + Surface(uint16 width, uint16 height); ~Surface(); - + static void initialise(); static void deinitialise(); @@ -53,7 +53,7 @@ public: void loadScreen(uint16 resourceId); void writeChar(uint16 x, uint16 y, uint8 ascii, bool transparent, uint8 colour); - void writeString(uint16 x, uint16 y, Common::String line, bool transparent, + void writeString(uint16 x, uint16 y, Common::String line, bool transparent, uint8 colour = DIALOG_TEXT_COLOUR, bool varLength = true); void transparentCopyTo(Surface *dest); void copyTo(Surface *dest); diff --git a/engines/parallaction/callables_br.cpp b/engines/parallaction/callables_br.cpp index 829195fd7a..628ba0c1f1 100644 --- a/engines/parallaction/callables_br.cpp +++ b/engines/parallaction/callables_br.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "parallaction/parallaction.h" namespace Parallaction { diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp index 8f5c80fc0c..33d36cc03b 100644 --- a/engines/parallaction/callables_ns.cpp +++ b/engines/parallaction/callables_ns.cpp @@ -24,7 +24,6 @@ */ -#include "common/stdafx.h" #include "common/system.h" #include "common/file.h" diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp index 5e419def52..3aecf2ae25 100644 --- a/engines/parallaction/debug.cpp +++ b/engines/parallaction/debug.cpp @@ -24,7 +24,6 @@ */ -#include "common/stdafx.h" #include "common/system.h" #include "parallaction/parallaction.h" diff --git a/engines/parallaction/defs.h b/engines/parallaction/defs.h index c41130670e..f2baab134d 100644 --- a/engines/parallaction/defs.h +++ b/engines/parallaction/defs.h @@ -26,7 +26,6 @@ #ifndef PARALLACTION_DEFS_H #define PARALLACTION_DEFS_H -#include "common/stdafx.h" #include "common/list.h" #include "common/rect.h" diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index 8ad79f34eb..33da65fba4 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "base/plugins.h" #include "common/config-manager.h" diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp index 15a280d3be..07b2abb849 100644 --- a/engines/parallaction/dialogue.cpp +++ b/engines/parallaction/dialogue.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "common/events.h" #include "parallaction/parallaction.h" diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp index 5b79ad7df6..b2e8607c22 100644 --- a/engines/parallaction/disk_br.cpp +++ b/engines/parallaction/disk_br.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "parallaction/parallaction.h" diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp index 8b5ce850ff..3f11a19cce 100644 --- a/engines/parallaction/disk_ns.cpp +++ b/engines/parallaction/disk_ns.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "graphics/iff.h" #include "graphics/surface.h" diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp index 7862a4a0c6..4a36061779 100644 --- a/engines/parallaction/exec_br.cpp +++ b/engines/parallaction/exec_br.cpp @@ -1,5 +1,4 @@ -#include "common/stdafx.h" #include "parallaction/parallaction.h" namespace Parallaction { diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp index 2b88469702..a81ae6099d 100644 --- a/engines/parallaction/exec_ns.cpp +++ b/engines/parallaction/exec_ns.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "parallaction/parallaction.h" #include "parallaction/sound.h" diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp index afa00f81af..dc2f62f47c 100644 --- a/engines/parallaction/font.cpp +++ b/engines/parallaction/font.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "common/stream.h" diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp index 6a8ef0718b..c9320014ed 100644 --- a/engines/parallaction/graphics.cpp +++ b/engines/parallaction/graphics.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/system.h" #include "common/file.h" diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp index 06d48744be..4e34325404 100644 --- a/engines/parallaction/inventory.cpp +++ b/engines/parallaction/inventory.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "parallaction/parallaction.h" diff --git a/engines/parallaction/menu.cpp b/engines/parallaction/menu.cpp index 14d50c6373..acc84edff4 100644 --- a/engines/parallaction/menu.cpp +++ b/engines/parallaction/menu.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/system.h" #include "parallaction/parallaction.h" diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp index 0e0d7c4c38..30ce5b77a9 100644 --- a/engines/parallaction/objects.cpp +++ b/engines/parallaction/objects.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "parallaction/objects.h" #include "parallaction/parser.h" diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 7b641bf838..22ebd51439 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "common/config-manager.h" #include "common/events.h" #include "common/file.h" diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp index f2b9626ead..499da701dc 100644 --- a/engines/parallaction/parallaction_br.cpp +++ b/engines/parallaction/parallaction_br.cpp @@ -23,8 +23,8 @@ * */ -#include "common/stdafx.h" #include "common/system.h" +#include "common/util.h" #include "parallaction/parallaction.h" #include "parallaction/sound.h" diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index 46161c5021..40d5f30a30 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/engines/parallaction/parser.cpp b/engines/parallaction/parser.cpp index dfda083392..70e43babba 100644 --- a/engines/parallaction/parser.cpp +++ b/engines/parallaction/parser.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "parallaction/parallaction.h" diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp index 94f5b0d790..7ee6fe5a10 100644 --- a/engines/parallaction/parser_br.cpp +++ b/engines/parallaction/parser_br.cpp @@ -1,4 +1,4 @@ -#include "common/stdafx.h" + #include "parallaction/parallaction.h" #include "parallaction/sound.h" diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp index 1b47f2fe3d..a834648291 100644 --- a/engines/parallaction/parser_ns.cpp +++ b/engines/parallaction/parser_ns.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "parallaction/parallaction.h" #include "parallaction/sound.h" diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp index 299eba18a3..c37feaa421 100644 --- a/engines/parallaction/saveload.cpp +++ b/engines/parallaction/saveload.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/savefile.h" #include "gui/dialog.h" diff --git a/engines/parallaction/sound.cpp b/engines/parallaction/sound.cpp index 9b8e179ccb..a8c584c56b 100644 --- a/engines/parallaction/sound.cpp +++ b/engines/parallaction/sound.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/file.h" #include "common/stream.h" diff --git a/engines/parallaction/staticres.cpp b/engines/parallaction/staticres.cpp index 94d2692ff1..2d5cb5f7e6 100644 --- a/engines/parallaction/staticres.cpp +++ b/engines/parallaction/staticres.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "parallaction/parallaction.h" diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp index 73b7407308..4d38bc93f0 100644 --- a/engines/parallaction/walk.cpp +++ b/engines/parallaction/walk.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "parallaction/parallaction.h" namespace Parallaction { diff --git a/engines/queen/bankman.cpp b/engines/queen/bankman.cpp index f43af18285..69014096eb 100644 --- a/engines/queen/bankman.cpp +++ b/engines/queen/bankman.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "queen/bankman.h" #include "queen/resource.h" diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp index 4d1ec53e09..561c875628 100644 --- a/engines/queen/command.cpp +++ b/engines/queen/command.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/events.h" #include "common/system.h" #include "queen/command.h" diff --git a/engines/queen/credits.cpp b/engines/queen/credits.cpp index 5e411f4408..5893d0e857 100644 --- a/engines/queen/credits.cpp +++ b/engines/queen/credits.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "queen/credits.h" #include "queen/display.h" diff --git a/engines/queen/cutaway.cpp b/engines/queen/cutaway.cpp index 721d7bb318..1012740040 100644 --- a/engines/queen/cutaway.cpp +++ b/engines/queen/cutaway.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "queen/cutaway.h" #include "queen/bankman.h" diff --git a/engines/queen/debug.cpp b/engines/queen/debug.cpp index 22481d377d..63b8432ee5 100644 --- a/engines/queen/debug.cpp +++ b/engines/queen/debug.cpp @@ -23,7 +23,8 @@ * */ -#include "common/stdafx.h" +#include "common/scummsys.h" + #include "queen/debug.h" #include "queen/graphics.h" diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp index 9c4101f1d3..11b1bb9da7 100644 --- a/engines/queen/display.cpp +++ b/engines/queen/display.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "graphics/cursorman.h" diff --git a/engines/queen/graphics.cpp b/engines/queen/graphics.cpp index 6199a75e7c..f863f7663c 100644 --- a/engines/queen/graphics.cpp +++ b/engines/queen/graphics.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "queen/graphics.h" #include "queen/bankman.h" diff --git a/engines/queen/grid.cpp b/engines/queen/grid.cpp index be0871b71d..b1191c3bde 100644 --- a/engines/queen/grid.cpp +++ b/engines/queen/grid.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "queen/grid.h" #include "queen/display.h" diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index 10a8664c0e..ba15aaf721 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/events.h" #include "common/system.h" diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index c75b03a5c0..739b78b0bc 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/events.h" #include "common/system.h" #include "queen/journal.h" diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp index 1a196ddc09..fb1105084e 100644 --- a/engines/queen/logic.cpp +++ b/engines/queen/logic.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/events.h" #include "common/system.h" diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp index 7d37513a9f..e250a9b79c 100644 --- a/engines/queen/music.cpp +++ b/engines/queen/music.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "queen/music.h" #include "queen/queen.h" #include "queen/resource.h" diff --git a/engines/queen/musicdata.cpp b/engines/queen/musicdata.cpp index a0b2a73697..57de971931 100644 --- a/engines/queen/musicdata.cpp +++ b/engines/queen/musicdata.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "queen/sound.h" namespace Queen { diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 0c024a9eb4..b17b473947 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "base/plugins.h" @@ -328,17 +328,17 @@ void QueenEngine::findGameStateDescriptions(char descriptions[100][32]) { memset(marks, false, SAVESTATE_MAX_NUM * sizeof(bool)); //assume no savegames for this title filenames = _saveFileMan->listSavefiles(prefix); - + for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); file++){ //Obtain the last 2 digits of the filename, since they correspond to the save slot slot[0] = file->c_str()[file->size()-2]; slot[1] = file->c_str()[file->size()-1]; - + slotNum = atoi(slot); if (slotNum >= 0 && slotNum < SAVESTATE_MAX_NUM) marks[slotNum] = true; //mark this slot as valid } - + for (int i = 0; i < SAVESTATE_MAX_NUM; ++i) { if (marks[i]) { GameStateHeader header; diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp index 20b047cb71..8e33051287 100644 --- a/engines/queen/resource.cpp +++ b/engines/queen/resource.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/config-manager.h" #include "queen/resource.h" diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index 1da07cf97c..fffeaf5f1d 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/endian.h" #include "common/stream.h" diff --git a/engines/queen/state.cpp b/engines/queen/state.cpp index 273208718f..563df4c6fb 100644 --- a/engines/queen/state.cpp +++ b/engines/queen/state.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "queen/state.h" namespace Queen { diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index 8396356685..5b741adaf8 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/events.h" #include "common/system.h" #include "common/rect.h" diff --git a/engines/queen/walk.cpp b/engines/queen/walk.cpp index 6943ca1214..eef2954d9a 100644 --- a/engines/queen/walk.cpp +++ b/engines/queen/walk.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "queen/walk.h" #include "queen/bankman.h" @@ -431,7 +431,7 @@ int16 Walk::calcC(int16 c1, int16 c2, int16 c3, int16 c4, int16 lastc) { } int16 Walk::findAreaPosition(int16 *x, int16 *y, bool recalibrate) { - // In order to locate the nearest available area, the original algorithm + // In order to locate the nearest available area, the original algorithm // computes the horizontal and vertical distances for each available area. // Unlike the original, we also compute the diagonal distance. // To get an example of this in action, in the room D1, make Joe walking diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index 01a75f4af1..c9f4bd4da8 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -22,7 +22,7 @@ * $Id$ * */ -#include "common/stdafx.h" + #include "common/file.h" @@ -397,7 +397,7 @@ void SagaEngine::getExcuseInfo(int verb, const char *&textString, int &soundReso if (verb == _script->getVerbType(kVerbPickUp)) { textString = getTextString(kTextICantPickup); soundResourceId = RID_BOAR_VOICE_007; - } else + } else if (verb == _script->getVerbType(kVerbLookAt)) { textString = getTextString(kTextNothingSpecial); soundResourceId = RID_BOAR_VOICE_006; @@ -462,7 +462,7 @@ ColorId SagaEngine::KnownColor2ColorId(KnownColor knownColor) { break; case (kKnownColorWhite): colorId = kITEColorBrightWhite; - break; + break; case (kKnownColorBlack): colorId = kIHNMColorBlack; break; diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp index 55089b4aea..b73a6fae28 100644 --- a/engines/saga/saveload.cpp +++ b/engines/saga/saveload.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/savefile.h" @@ -113,7 +113,7 @@ uint SagaEngine::getNewSaveSlotNumber() { void SagaEngine::fillSaveList() { assert(_saveMarks); - + int i; Common::InSaveFile *in; Common::StringList filenames; @@ -124,20 +124,20 @@ void SagaEngine::fillSaveList() { name = calcSaveFileName(MAX_SAVES); name[strlen(name) - 2] = '*'; name[strlen(name) - 1] = 0; - + memset(_saveMarks, false, MAX_SAVES * sizeof(bool)); //assume no savegames for this title filenames = _saveFileMan->listSavefiles(name); - + for (Common::StringList::iterator file = filenames.begin(); file != filenames.end(); file++){ //Obtain the last 2 digits of the filename, since they correspond to the save slot slot[0] = file->c_str()[file->size()-2]; slot[1] = file->c_str()[file->size()-1]; - + slotNum = atoi(slot); if (slotNum >= 0 && slotNum < MAX_SAVES) _saveMarks[slotNum] = true; //mark this slot as valid } - + _saveFilesMaxCount = 0; for (i = 0; i < MAX_SAVES; i++) { if (_saveMarks[i]) { @@ -291,7 +291,7 @@ void SagaEngine::load(const char *fileName) { if (_scene->currentChapterNumber() == 8) _interface->setMode(kPanelChapterSelection); if (getGameId() != GID_IHNM_DEMO) { - _music->play(_music->_songTable[_scene->getCurrentMusicTrack()], _scene->getCurrentMusicRepeat() ? MUSIC_LOOP : MUSIC_NORMAL); + _music->play(_music->_songTable[_scene->getCurrentMusicTrack()], _scene->getCurrentMusicRepeat() ? MUSIC_LOOP : MUSIC_NORMAL); } else { _music->play(3, MUSIC_LOOP); } diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 38517c1d69..de35d4b821 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" // for setFocusRectangle/clearFocusRectangle #include "scumm/scumm.h" #include "scumm/actor.h" @@ -71,7 +71,7 @@ void Actor::initActor(int mode) { _heFlags = 0; _heTalking = false; // end HE specific - + if (mode == -1) { _offsX = _offsY = 0; @@ -385,7 +385,7 @@ void Actor::startWalkActor(int destX, int destY, int dir) { if (_moving && _walkdata.destdir == dir && _walkdata.dest.x == abr.x && _walkdata.dest.y == abr.y) return; } - + if (_pos.x == abr.x && _pos.y == abr.y) { if (dir != _facing) turnToDirection(dir); @@ -937,7 +937,7 @@ static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) static int checkXYInBoxBounds(int boxnum, int x, int y, int &destX, int &destY) { BoxCoords box = g_scumm->getBoxCoordinates(boxnum); int xmin, xmax; - + // We are supposed to determine the point (destX,destY) contained in // the given box which is closest to the point (x,y), and then return // some kind of "distance" between the two points. @@ -981,7 +981,7 @@ static int checkXYInBoxBounds(int boxnum, int x, int y, int &destX, int &destY) xmin = (ul + ll) / 2; xmax = (ur + lr) / 2; cury = (top + bottom) / 2; - + if (cury < y) { top = cury; ul = xmin; @@ -993,7 +993,7 @@ static int checkXYInBoxBounds(int boxnum, int x, int y, int &destX, int &destY) } } while (cury != y); } - + // Now that we have limited the value of destX to a fixed // interval, it's a trivial matter to finally determine it. if (x < xmin) { @@ -1447,7 +1447,7 @@ void Actor::drawActorCostume(bool hitTestMode) { bcr->_actorY *= V12_Y_MULTIPLIER; } bcr->_actorX -= _vm->_virtscr[kMainVirtScreen].xstart; - + if (_vm->_game.platform == Common::kPlatformNES) { // In the NES version, when the actor is facing right, // we need to shift it 8 pixels to the left @@ -2497,7 +2497,7 @@ void Actor::saveLoadWithSerializer(Serializer *ser) { } ser->saveLoadEntries(this, actorEntries); - + if (ser->isLoading() && _vm->_game.version <= 2 && ser->getVersion() < VER(70)) { _pos.x >>= V12_X_SHIFT; _pos.y >>= V12_Y_SHIFT; diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp index 86a19540d6..31e7f75878 100644 --- a/engines/scumm/akos.cpp +++ b/engines/scumm/akos.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/actor.h" #include "scumm/akos.h" @@ -250,7 +250,7 @@ void AkosCostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) { } if (!found) { error("Sequence not found in actor %p costume %d", (void *)a, a->_costume); - } + } } } @@ -276,7 +276,7 @@ void AkosCostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) { error("Sequence not found in actor %p costume %d", (void *)a, a->_costume); } } - } + } break; } } else { @@ -312,7 +312,7 @@ void AkosRenderer::setPalette(byte *new_palette) { if (_vm->_game.heversion == 70) { for (i = 0; i < size; i++) _palette[i] = _vm->_HEV7ActorPalette[_palette[i]]; - } + } if (size == 256) { byte color = new_palette[0]; @@ -571,7 +571,7 @@ void AkosRenderer::codec1_genericDecode(Codec1 &v1) { if (color && !masked && !skip_column) { pcolor = _palette[color]; if (_shadow_mode == 1) { - if (pcolor == 13) + if (pcolor == 13) pcolor = _shadow_table[*dst]; } else if (_shadow_mode == 2) { error("codec1_spec2"); // TODO @@ -977,7 +977,7 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) { v1.destptr = (byte *)_out.pixels + v1.y * _out.pitch + v1.x; codec1_genericDecode(v1); - + return drawFlag; } @@ -1047,9 +1047,9 @@ byte AkosRenderer::codec5(int xmoveCur, int ymoveCur) { bdd.mirror = !_mirror; drawBomp(bdd); - + _useBompPalette = false; - + return 0; } @@ -1086,7 +1086,7 @@ void AkosRenderer::akos16DecodeLine(byte *buf, int32 numbytes, int32 dir) { *buf = _akos16.color; buf += dir; } - + if (!_akos16.repeatMode) { AKOS16_FILL_BITS() bits = _akos16.bits & 3; @@ -1143,7 +1143,7 @@ void AkosRenderer::akos16Decompress(byte *dest, int32 pitch, const byte *src, in } maskpitch = _numStrips; - + maskptr = _vm->getMaskBuffer(maskLeft, maskTop, zBuf); assert(t_height > 0); @@ -1172,7 +1172,7 @@ byte AkosRenderer::codec16(int xmoveCur, int ymoveCur) { error("codec16: _actorHitMode not yet implemented"); return 0; } - + if (!_mirror) { clip.left = (_actorX - xmoveCur - _width) + 1; } else { @@ -1309,7 +1309,7 @@ byte AkosRenderer::codec32(int xmoveCur, int ymoveCur) { if (diff > 0) { src.bottom -= diff; dst.bottom -= diff; - } + } if (dst.isValidRect() == false) return 0; @@ -1420,7 +1420,7 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con curpos += 3; break; case AKC_SoundStuff: - if (_game.heversion >= 61) + if (_game.heversion >= 61) curpos += 6; else curpos += 8; diff --git a/engines/scumm/base-costume.cpp b/engines/scumm/base-costume.cpp index fe87dc65ec..795abb8685 100644 --- a/engines/scumm/base-costume.cpp +++ b/engines/scumm/base-costume.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/base-costume.h" #include "scumm/costume.h" diff --git a/engines/scumm/bomp.cpp b/engines/scumm/bomp.cpp index 0ffb80970c..ecd6f16923 100644 --- a/engines/scumm/bomp.cpp +++ b/engines/scumm/bomp.cpp @@ -22,7 +22,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/akos.h" #include "scumm/bomp.h" diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp index e79cea4359..0fa8b579ca 100644 --- a/engines/scumm/boxes.cpp +++ b/engines/scumm/boxes.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/actor.h" #include "scumm/boxes.h" @@ -552,7 +552,7 @@ bool ScummEngine::checkXYInBoxBounds(int boxnum, int x, int y) { if (p.sqrDist(tmp) <= 4) return true; } - + // Finally, fall back to the classic algorithm to compute containment // in a convex polygon: For each (oriented) side of the polygon // (quadrangle in this case), compute whether p is "left" or "right" diff --git a/engines/scumm/camera.cpp b/engines/scumm/camera.cpp index ea6ac9b528..e2e6ff0cb6 100644 --- a/engines/scumm/camera.cpp +++ b/engines/scumm/camera.cpp @@ -22,7 +22,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/intern.h" #include "scumm/actor.h" diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index 6eb6cfd7c6..4ae98c7ec0 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "scumm/charset.h" #include "scumm/scumm.h" #include "scumm/nut_renderer.h" @@ -36,11 +36,11 @@ namespace Scumm { TODO: Right now our charset renderers directly access _textSurface, as well as the virtual screens of ScummEngine. Ideally, this would not be the case. Instead, -ScummVM would simply pass the appropriate Surface to the resp. methods. +ScummVM would simply pass the appropriate Surface to the resp. methods. Of course it is not quite as simple, various flags and offsets have to be taken into account for that. -The advantage will be cleaner coder (easier to debug, in particular), and a +The advantage will be cleaner coder (easier to debug, in particular), and a better separation of the various modules. */ @@ -89,7 +89,7 @@ void ScummEngine::loadCJKFont() { debug(2, "Loading CJK Font"); _useCJKMode = true; _textSurfaceMultiplier = 1; // No multiplication here - + switch (_language) { case Common::KO_KOR: fp.seek(2, SEEK_CUR); @@ -203,7 +203,7 @@ static int SJIStoFMTChunk(int f, int s) { //converts sjis code to fmt font offse } byte *ScummEngine::get2byteCharPtr(int idx) { - switch (_language) { + switch (_language) { case Common::KO_KOR: idx = ((idx % 256) - 0xb0) * 94 + (idx / 256) - 0xa1; break; @@ -394,7 +394,7 @@ int CharsetRenderer::getStringWidth(int arg, const byte *text) { continue; } } - + // Some localizations may override colors // See credits in Chinese COMI if (chr == '^' && pos == 1) { diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp index ac61d39d25..83fa71e7b6 100644 --- a/engines/scumm/costume.cpp +++ b/engines/scumm/costume.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/actor.h" #include "scumm/costume.h" @@ -72,7 +72,7 @@ static const int v1MMNESLookup[25] = { 0x02, 0x00, 0x07, 0x0C, 0x04, 0x09, 0x0A, 0x12, 0x0B, 0x14, 0x0D, 0x11, 0x0F, 0x0E, 0x10, - 0x17, 0x00, 0x01, 0x05, 0x16 + 0x17, 0x00, 0x01, 0x05, 0x16 }; @@ -383,7 +383,7 @@ void ClassicCostumeRenderer::procC64(Codec1 &v1, int actor) { while (len--) { if (!rep) color = *src++; - + if (0 <= y && y < _out.h && 0 <= v1.x && v1.x < _out.w) { if (!_mirror) { LINE(0, 0); LINE(2, 2); LINE(4, 4); LINE(6, 6); @@ -446,7 +446,7 @@ void ClassicCostumeRenderer::proc3(Codec1 &v1) { do { if (_scaleY == 255 || v1.scaletable[scaleIndexY++] < _scaleY) { masked = (y < 0 || y >= _out.h) || (v1.x < 0 || v1.x >= _out.w) || (v1.mask_ptr && (mask[0] & maskbit)); - + if (color && !masked) { if (_shadow_mode & 0x20) { pcolor = _shadow_table[*dst]; @@ -513,7 +513,7 @@ void ClassicCostumeRenderer::proc3_ami(Codec1 &v1) { do { if (_scaleY == 255 || v1.scaletable[_scaleIndexY] < _scaleY) { masked = (y < 0 || y >= _out.h) || (v1.x < 0 || v1.x >= _out.w) || (v1.mask_ptr && (mask[0] & maskbit)); - + if (color && !masked) { *dst = _palette[color]; } @@ -593,8 +593,8 @@ void ClassicCostumeLoader::loadCostume(int id) { error("Costume %d with format 0x%X is invalid", id, _format); } - - // In GF_OLD_BUNDLE games, there is no actual palette, just a single color byte. + + // In GF_OLD_BUNDLE games, there is no actual palette, just a single color byte. // Don't forget, these games were designed around a fixed 16 color HW palette :-) // In addition, all offsets are shifted by 2; we accomodate that via a separate // _baseptr value (instead of adding tons of if's throughout the code). @@ -715,7 +715,7 @@ byte ClassicCostumeRenderer::drawLimb(const Actor *a, int limb) { // Determine the position the limb is at i = cost.curpos[limb] & 0x7FFF; - + // Get the frame pointer for that limb frameptr = _loaded._baseptr + READ_LE_UINT16(_loaded._frameOffsets + limb * 2); @@ -900,12 +900,12 @@ byte ClassicCostumeLoader::increaseAnim(Actor *a, int slot) { i = a->_cost.curpos[slot] & 0x7FFF; end = a->_cost.end[slot]; code = _animCmds[i] & 0x7F; - + if (_vm->_game.version <= 3) { if (_animCmds[i] & 0x80) a->_cost.soundCounter++; } - + do { if (!highflag) { if (i++ >= end) @@ -1054,7 +1054,7 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) { int xpos = 0; int ypos = _loaded._maxHeight - offsetY; - + if (flipped) { if (offsetX) xpos += (offsetX-1) * 8; diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index b8b2cbcb6d..604846602e 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -22,7 +22,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "common/util.h" #include "graphics/cursorman.h" diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp index 68a001c983..83507abf76 100644 --- a/engines/scumm/debugger.cpp +++ b/engines/scumm/debugger.cpp @@ -22,7 +22,7 @@ * $Id$ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/file.h" @@ -745,7 +745,7 @@ void ScummDebugger::drawBox(int box) { r[1] = coords.ur; r[2] = coords.lr; r[3] = coords.ll; - + if (_vm->_game.version <= 2) { for (int i = 0; i < 4; ++i) { r[i].x *= V12_X_MULTIPLIER; diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 90c6e40aa7..544d2d2392 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "base/plugins.h" #include "common/config-manager.h" @@ -77,7 +75,7 @@ Common::String ScummEngine::generateFilename(const int room) const { case kGenDiskNum: snprintf(buf, sizeof(buf), _filenamePattern.pattern, diskNumber); break; - + case kGenRoomNum: snprintf(buf, sizeof(buf), _filenamePattern.pattern, room); break; @@ -91,7 +89,7 @@ Common::String ScummEngine::generateFilename(const int room) const { int disk = 0; if (_heV7DiskOffsets) disk = _heV7DiskOffsets[room]; - + switch (disk) { case 2: id = 'b'; @@ -110,7 +108,7 @@ Common::String ScummEngine::generateFilename(const int room) const { } else { id = diskNumber + '0'; } - + if (_filenamePattern.genMethod == kGenHEPC) { // For HE >= 98, we already called snprintf above. if (_game.heversion < 98 || room < 0) @@ -185,7 +183,7 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com // Search for a node with the given "name", inside fslist. Ignores case -// when performing the matching. The first match is returned, so if you +// when performing the matching. The first match is returned, so if you // search for "resource" and two nodes "RESOURE and "resource" are present, // the first match is used. static bool searchFSNode(const FSList &fslist, const Common::String &name, FilesystemNode &result) { @@ -251,7 +249,7 @@ static Common::Language detectLanguage(const FSList &fslist, byte id) { return Common::DE_DEU; case 257460: // 04cf6a6ba6f57e517bc40eb81862cfb0 return Common::FR_FRA; - case 231402: // 93d13fcede954c78e65435592182a4db + case 231402: // 93d13fcede954c78e65435592182a4db return Common::IT_ITA; case 228772: // 5d9ad90d3a88ea012d25d61791895ebe return Common::PT_BRA; @@ -260,7 +258,7 @@ static Common::Language detectLanguage(const FSList &fslist, byte id) { } } } - + return Common::UNK_LANG; } @@ -287,7 +285,7 @@ static void computeGameSettingsFromMD5(const FSList &fslist, const GameFilenameP } else if (gfp->platform != Common::kPlatformUnknown) { dr.game.platform = gfp->platform; } - + // HACK: Special case to distinguish the V1 demo from the full version // (since they have identical MD5): if (dr.game.id == GID_MANIAC && !strcmp(gfp->pattern, "%02d.MAN")) { @@ -299,7 +297,7 @@ static void computeGameSettingsFromMD5(const FSList &fslist, const GameFilenameP if (dr.extra && strstr(dr.extra, "Demo")) { dr.game.features |= GF_DEMO; } - + // HACK: Detect COMI & Dig languages if (dr.language == UNK_LANG && (dr.game.id == GID_CMI || dr.game.id == GID_DIG)) { dr.language = detectLanguage(fslist, dr.game.id); @@ -314,7 +312,7 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu DescMap fileMD5Map; DetectorResult dr; char md5str[32+1]; - + for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { if (!file->isDirectory()) { DetectorDesc d; @@ -330,7 +328,7 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu // so we can just skip over everything with a differing gameid. if (gameid && scumm_stricmp(gameid, gfp->gameid)) continue; - + // Generate the detectname corresponding to the gfp. If the file doesn't // exist in the directory we are looking at, we can skip to the next // one immediately. @@ -345,8 +343,8 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu dr.language = gfp->language; dr.md5.clear(); dr.extra = 0; - - // ____ _ _ + + // ____ _ _ // | _ \ __ _ _ __| |_ / | // | |_) / _` | '__| __| | | // | __/ (_| | | | |_ | | @@ -378,29 +376,29 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu // Sanity check: We *should* have found a matching gameid / variant at this point. // If not, then there's a bug in our data tables... assert(dr.game.gameid != 0); - + // Add it to the list of detected games results.push_back(dr); } } } - - // If an exact match for this file has already been found, don't bother + + // If an exact match for this file has already been found, don't bother // looking at it anymore. if (d.md5Entry) continue; - // ____ _ ____ + // ____ _ ____ // | _ \ __ _ _ __| |_ |___ \ * // | |_) / _` | '__| __| __) | - // | __/ (_| | | | |_ / __/ + // | __/ (_| | | | |_ / __/ // |_| \__,_|_| \__| |_____| // // PART 2: Fuzzy matching for files with unknown MD5. // - - + + // We loop over the game variants matching the gameid associated to // the gfp record. We then try to decide for each whether it could be // appropriate or not. @@ -426,8 +424,8 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu } continue; } - - + + // Add the game/variant to the candidates list if it is consistent // with the file(s) we are seeing. if (testGame(g, fileMD5Map, file)) @@ -450,7 +448,7 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com warning("SCUMM detectGames: failed to open '%s' for read access", d.node.getPath().c_str()); return false; } - + if (file == "maniac1.d64" || file == "maniac1.dsk" || file == "zak1.d64") { // TODO } else if (file == "00.LFL") { @@ -458,10 +456,10 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com if (g->version > 3) return false; - // Read a few bytes to narrow down the game. + // Read a few bytes to narrow down the game. byte buf[6]; tmp.read(buf, 6); - + if (buf[0] == 0xbc && buf[1] == 0xb9) { // The NES version of MM if (g->id == GID_MANIAC && g->platform == Common::kPlatformNES) { @@ -472,7 +470,7 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com (buf[0] == 0xCD && buf[1] == 0xFE)) { // Commodore 64 // Could be V0 or V1. // Candidates: maniac classic, zak classic - + if (g->version >= 2) return false; @@ -556,14 +554,14 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com else unknown, do not accept it */ - + // We now try to exclude various possibilities by the presence of certain // LFL files. Note that we only exclude something based on the *presence* // of a LFL file here; compared to checking for the absence of files, this // has the advantage that we are less likely to accidentally exclude demos // (which, after all, are usually missing many LFL files present in the // full version of the game). - + // No version of Indy3 has 05.LFL but MM, Loom and Zak all have it if (g->id == GID_INDY3 && fileMD5Map.contains("05.LFL")) return false; @@ -605,14 +603,14 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com _numCostumes 199 _numScripts 199 _numSounds 199 - + Any good ideas to distinguish those? Maybe by the presence / absence of some files? At least PASS and the monkeyEGA demo differ by 903.LFL missing... And the count of DISK??.LEC files differs depending on what version - you have (4 or 8 floppy versions). + you have (4 or 8 floppy versions). loomcd of course shipped on only one "disc". - + pass: 000.LFL, 901.LFL, 902.LFL, 904.LFL, disk01.lec monkeyEGA: 000.LFL, 901-904.LFL, DISK01-09.LEC monkeyEGA DEMO: 000.LFL, 901.LFL, 902.LFL, 904.LFL, disk01.lec @@ -622,7 +620,7 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com const bool has903LFL = fileMD5Map.contains("903.LFL"); const bool hasDisk02 = fileMD5Map.contains("DISK02.LEC"); - + // There is not much we can do based on the presence / absence // of files. Only that if 903.LFL is present, it can't be PASS; // and if DISK02.LEC is present, it can't be LoomCD @@ -639,12 +637,12 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com // So at this point the gameid is determined, but not necessarily // the variant! - + // TODO: Add code that handles this, at least for the non-HE games. // Note sure how realistic it is to correctly detect HE-game // variants, would require me to look at a sufficiently large // sample collection of HE games (assuming I had the time :). - + // TODO: For Mac versions in container file, we can sometimes // distinguish the demo from the regular version by looking // at the content of the container file and then looking for @@ -681,7 +679,7 @@ GameList Engine_SCUMM_detectGames(const FSList &fslist) { // TODO: We still don't handle the FM-TOWNS demos (like zakloom) very well. // In particular, they are detected as ZakTowns, which is bad. - + for (Common::List<DetectorResult>::iterator x = results.begin(); x != results.end(); ++x) { const PlainGameDescriptor *g = findPlainGameDescriptor(x->game.gameid, gameDescriptions); assert(g); @@ -802,7 +800,7 @@ PluginError Engine_SCUMM_create(OSystem *syst, Engine **engine) { printf("Your game version appears to be unknown. Please, report the following\n"); printf("data to the ScummVM team along with name of the game you tried to add\n"); printf("and its version/language/etc.:\n"); - + printf(" SCUMM gameid '%s', file '%s', MD5 '%s'\n\n", res.game.gameid, generateFilenameForDetection(res.fp.pattern, res.fp.genMethod).c_str(), @@ -812,7 +810,7 @@ PluginError Engine_SCUMM_create(OSystem *syst, Engine **engine) { } // Check for a user override of the platform. We allow the user to override - // the platform, to make it possible to add games which are not yet in + // the platform, to make it possible to add games which are not yet in // our MD5 database but require a specific platform setting. // TODO: Do we really still need / want the platform override ? if (ConfMan.hasKey("platform")) @@ -839,7 +837,7 @@ PluginError Engine_SCUMM_create(OSystem *syst, Engine **engine) { *engine = new ScummEngine_v2(syst, res); break; case 3: - if ((res.game.features & GF_OLD256) || res.game.platform == Common::kPlatformPCEngine) + if ((res.game.features & GF_OLD256) || res.game.platform == Common::kPlatformPCEngine) *engine = new ScummEngine_v3(syst, res); else *engine = new ScummEngine_v3old(syst, res); diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h index 70118b9baf..41feac4264 100644 --- a/engines/scumm/detection_tables.h +++ b/engines/scumm/detection_tables.h @@ -26,8 +26,6 @@ #ifndef SCUMM_DETECTION_TABLES_H #define SCUMM_DETECTION_TABLES_H -#include "common/stdafx.h" - #include "common/advancedDetector.h" #include "common/rect.h" #include "common/util.h" @@ -250,7 +248,7 @@ static const GameSettings gameVariantsTable[] = { {"fbear", "HE 70", 0, GID_FBEAR, 6, 70, MDT_NONE, GF_USE_KEY, Common::kPlatformWindows}, {"puttmoon", "", 0, GID_HEGAME, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK}, - + {"puttputt", "HE 61", 0, GID_HEGAME, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK}, {"puttputt", "HE 60", 0, GID_HEGAME, 6, 60, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, Common::kPlatformPC}, {"puttputt", "Demo", 0, GID_PUTTDEMO, 6, 60, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK}, @@ -648,7 +646,7 @@ static const GameFilenamePattern gameFilenamesTable[] = { { "pajama2", "PajamaTAL", kGenHEPC, UNK_LANG, UNK, 0 }, { "pajama2", "PyjamaDBMN", kGenHEPC, Common::DE_DEU, UNK, 0 }, { "pajama2", "PyjamaDBMN", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 }, - { "pajama2", "PyjamaHM", kGenHEMac, Common::FR_FRA, Common::kPlatformMacintosh, 0 }, + { "pajama2", "PyjamaHM", kGenHEMac, Common::FR_FRA, Common::kPlatformMacintosh, 0 }, { "pajama2", "PYJAMA2", kGenHEPC, Common::DE_DEU, UNK, 0 }, { "pajama2", "Pyjama Pit 2", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 }, { "pajama2", "Pyjama Pit 2 Demo", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 }, @@ -736,7 +734,7 @@ static const GameFilenamePattern gameFilenamesTable[] = { { "puttzoo", "Putt-Putt Redt De Zoo", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 }, { "puttzoo", "puttzoo", kGenHEPC, UNK_LANG, UNK, 0 }, { "puttzoo", "Puttzoo Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, - { "puttzoo", "PuttZoo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, + { "puttzoo", "PuttZoo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, { "puttzoo", "T\xC3\xB6""ff-T\xC3\xB6""ff\xE2\x84\xA2 Zoo Demo", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 }, // UTF-8 encoding { "puttzoo", "T\xF6""ff-T""\xF6""ff\x99 Zoo Demo", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 }, // Windows encoding { "puttzoo", "zoodemo", kGenHEPC, UNK_LANG, UNK, 0 }, diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index 1666578c4c..828c665c5f 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/savefile.h" @@ -114,7 +114,7 @@ static const ResString string_map_table_v7[] = { {70, "/BOOT.008/Save"}, {71, "/BOOT.009/Load"}, {72, "/BOOT.010/Play"}, - {73, "/BOOT.011/Cancel"}, + {73, "/BOOT.011/Cancel"}, {74, "/BOOT.012/Quit"}, {75, "/BOOT.013/OK"}, {0, ""}, @@ -250,7 +250,7 @@ SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel, _container->setHints(GUI::THEME_HINT_USE_SHADOW); _gfxWidget = new GUI::GraphicsWidget(this, 0, 0, 10, 10); - + _date = new StaticTextWidget(this, 0, 0, 10, 10, "No date saved", kTextAlignCenter); _time = new StaticTextWidget(this, 0, 0, 10, 10, "No time saved", kTextAlignCenter); _playtime = new StaticTextWidget(this, 0, 0, 10, 10, "No playtime saved", kTextAlignCenter); @@ -327,22 +327,22 @@ void SaveLoadChooser::reflowLayout() { int thumbH = ((g_system->getHeight() % 200 && g_system->getHeight() != 350) ? kThumbnailHeight2 : kThumbnailHeight1); _container->resize(thumbX - hPad, thumbY - vPad, kThumbnailWidth + hPad * 2, thumbH + vPad * 2 + kLineHeight * 4); - + // Add the thumbnail display _gfxWidget->resize(thumbX, thumbY, kThumbnailWidth, thumbH); - + int height = thumbY + thumbH + kLineHeight; _date->resize(thumbX, height, kThumbnailWidth, kLineHeight); - + height += kLineHeight; _time->resize(thumbX, height, kThumbnailWidth, kLineHeight); - + height += kLineHeight; _playtime->resize(thumbX, height, kThumbnailWidth, kLineHeight); - + _container->clearFlags(GUI::WIDGET_INVISIBLE); _gfxWidget->clearFlags(GUI::WIDGET_INVISIBLE); _date->clearFlags(GUI::WIDGET_INVISIBLE); @@ -435,7 +435,7 @@ Common::StringList generateSavegameList(ScummEngine *scumm, bool saveMode) { name[0] = 0; descriptions.push_back(name); } - + return descriptions; } @@ -570,7 +570,7 @@ enum { // If OTOH the dialog is closed with "Cancel" we do no such thing. // // These changes will achieve two things at once: Allow us to get rid of using -// "" as value for the domain, and in fact provide a somewhat better user +// "" as value for the domain, and in fact provide a somewhat better user // experience at the same time. ConfigDialog::ConfigDialog() : GUI::OptionsDialog("", "scummconfig") { @@ -907,7 +907,7 @@ void ValueDisplayDialog::open() { _timer = getMillis() + kDisplayDelay; } -SubtitleSettingsDialog::SubtitleSettingsDialog(ScummEngine *scumm, int value) +SubtitleSettingsDialog::SubtitleSettingsDialog(ScummEngine *scumm, int value) : InfoDialog(scumm, ""), _value(value) { } @@ -940,7 +940,7 @@ void SubtitleSettingsDialog::cycleValue() { "Speech and Subtitles", "Subtitles Only" }; - + _value = (_value + 1) % 3; setInfoText(subtitleDesc[_value]); @@ -954,7 +954,7 @@ Indy3IQPointsDialog::Indy3IQPointsDialog(ScummEngine *scumm, char* text) } void Indy3IQPointsDialog::handleKeyDown(Common::KeyState state) { - if (state.ascii == 'i') + if (state.ascii == 'i') close(); else ScummDialog::handleKeyDown(state); diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index 8d111492a2..17eedb24ee 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -22,7 +22,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "scumm/scumm.h" #include "scumm/actor.h" @@ -37,7 +37,7 @@ #include "scumm/util.h" #ifdef USE_ARM_GFX_ASM -extern "C" void DrawStripToScreenARM(int height, int width, byte const* text, byte const* src, byte* dst, +extern "C" void DrawStripToScreenARM(int height, int width, byte const* text, byte const* src, byte* dst, int vsPitch, int vmScreenWidth, int textSurfacePitch); extern "C" void Copy8ColARM(byte* dst, int dstPitch, const byte* src, int height); #endif /* USE_ARM_GFX_ASM */ @@ -108,7 +108,7 @@ static const TransitionEffect transitionEffects[6] = { 0, 0, 0, 24 } }, - + // Box wipe (a box expands from the upper-left corner to the lower-right corner) { 25, // Number of iterations @@ -125,7 +125,7 @@ static const TransitionEffect transitionEffects[6] = { 255, 0, 0, 0 } }, - + // Box wipe (a box expands from the lower-right corner to the upper-left corner) { 25, // Number of iterations @@ -142,7 +142,7 @@ static const TransitionEffect transitionEffects[6] = { 255, 0, 0, 0 } }, - + // Inverse box wipe { 25, // Number of iterations @@ -193,7 +193,7 @@ static const TransitionEffect transitionEffects[6] = { 255, 0, 0, 0 } } - + }; @@ -313,7 +313,7 @@ void ScummEngine::initScreens(int b, int h) { initVirtScreen(kVerbVirtScreen, h + adj, _screenWidth, _screenHeight - h - adj, false, false); _screenB = b; _screenH = h; - + _gdi->init(); } @@ -446,7 +446,7 @@ void ScummEngine::markRectAsDirty(VirtScreenNumber virt, int left, int right, in void ScummEngine::drawDirtyScreenParts() { // Update verbs updateDirtyScreen(kVerbVirtScreen); - + // Update the conversation area (at the top of the screen) updateDirtyScreen(kTextVirtScreen); @@ -544,7 +544,7 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i assert(top >= 0 && bottom <= vs->h); assert(x >= 0 && width <= vs->pitch); assert(_textSurface.pixels); - + // Perform some clipping if (width > vs->w - x) width = vs->w - x; @@ -556,10 +556,10 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i // Convert the vertical coordinates to real screen coords int y = vs->topline + top - _screenTop; int height = bottom - top; - + if (width <= 0 || height <= 0) return; - + const byte *src = vs->getPixels(x, top); int m = _textSurfaceMultiplier; byte *dst; @@ -579,7 +579,7 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i } dst = _compositeBuf; - + if (_game.version < 7) { // For The Dig, FT and COMI, we just blit everything to the screen at once. // For older games, things are more complicated. First off, we need to @@ -597,7 +597,7 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i assert(0 == (width & 3)); // Compose the text over the game graphics - + // TODO: Optimize this code. There are several things that come immediately to mind: // (1) Loop unrolling: We could read 4 or even 8 pixels at once, since everything is // a multiple of 8 here. @@ -956,7 +956,7 @@ void ScummEngine::restoreBackground(Common::Rect rect, byte backColor) { const int height = rect.height(); const int width = rect.width(); - + if (!height) return; @@ -989,7 +989,7 @@ void ScummEngine::restoreCharsetBg() { return; markRectAsDirty(vs->number, Common::Rect(vs->w, vs->h), USAGE_BIT_RESTORED); - + byte *screenBuf = vs->getPixels(0, 0); if (vs->hasTwoBuffers && _currentRoom != 0 && isLightOn()) { @@ -1037,7 +1037,7 @@ static void blit(byte *dst, int dstPitch, const byte *src, int srcPitch, int w, assert(h > 0); assert(src != NULL); assert(dst != NULL); - + if (w == srcPitch && w == dstPitch) { memcpy(dst, src, w*h); } else { @@ -1052,7 +1052,7 @@ static void blit(byte *dst, int dstPitch, const byte *src, int srcPitch, int w, static void fill(byte *dst, int dstPitch, byte color, int w, int h) { assert(h > 0); assert(dst != NULL); - + if (w == dstPitch) { memset(dst, color, w*h); } else { @@ -1117,7 +1117,7 @@ void ScummEngine::drawBox(int x, int y, int x2, int y2, int color) { // Adjust for the topline of the VirtScreen y -= vs->topline; y2 -= vs->topline; - + // Clip the coordinates if (x < 0) x = 0; @@ -1138,7 +1138,7 @@ void ScummEngine::drawBox(int x, int y, int x2, int y2, int color) { return; else if (y2 > vs->h) y2 = vs->h; - + width = x2 - x; height = y2 - y; @@ -1226,7 +1226,7 @@ void ScummEngine_v5::drawFlashlight() { if (_flashlight.isDrawn) { markRectAsDirty(kMainVirtScreen, _flashlight.x, _flashlight.x + _flashlight.w, _flashlight.y, _flashlight.y + _flashlight.h, USAGE_BIT_DIRTY); - + if (_flashlight.buffer) { fill(_flashlight.buffer, vs->pitch, 0, _flashlight.w, _flashlight.h); } @@ -1294,7 +1294,7 @@ void ScummEngine_v5::drawFlashlight() { _flashlight.buffer[maxrow + maxcol - j] = 0; } } - + _flashlight.isDrawn = true; } @@ -1399,7 +1399,7 @@ void GdiV2::prepareDrawBitmap(const byte *ptr, VirtScreen *vs, theX = 0; maxX = width; } - + // Decode and draw the image data. assert(height <= 128); for (; theX < maxX; theX++) { @@ -1453,7 +1453,7 @@ void GdiV2::prepareDrawBitmap(const byte *ptr, VirtScreen *vs, do { if (!runFlag) data = *src++; - + if (left <= theX) { *mask_ptr = data; mask_ptr += _numStrips; @@ -1491,7 +1491,7 @@ int Gdi::getZPlanes(const byte *ptr, const byte *zplane_list[9], bool bmapImage) else { numzbuf = _numZBuffer; assert(numzbuf <= 9); - + if (_vm->_game.features & GF_SMALL_HEADER) { if (_vm->_game.features & GF_16COLOR) zplane_list[1] = ptr + READ_LE_UINT16(ptr); @@ -1508,7 +1508,7 @@ int Gdi::getZPlanes(const byte *ptr, const byte *zplane_list[9], bool bmapImage) } else if (_vm->_game.version == 8) { // Find the OFFS chunk of the ZPLN chunk const byte *zplnOffsChunkStart = ptr + 24 + READ_BE_UINT32(ptr + 12); - + // Each ZPLN contains a WRAP chunk, which has (as always) an OFFS subchunk pointing // at ZSTR chunks. These once more contain a WRAP chunk which contains nothing but // an OFFS chunk. The content of this OFFS chunk contains the offsets to the @@ -1529,13 +1529,13 @@ int Gdi::getZPlanes(const byte *ptr, const byte *zplane_list[9], bool bmapImage) MKID_BE('ZP03'), MKID_BE('ZP04') }; - + for (i = 1; i < numzbuf; i++) { zplane_list[i] = _vm->findResource(zplane_tags[i], ptr); } } } - + return numzbuf; } @@ -1574,7 +1574,7 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, const int y, const } numzbuf = getZPlanes(ptr, zplane_list, false); - + const byte *tmsk_ptr = NULL; if (_vm->_game.heversion >= 72) { tmsk_ptr = _vm->findResource(MKID_BE('TMSK'), ptr); @@ -1626,7 +1626,7 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, const int y, const // COMI and HE games only uses flag value if (_vm->_game.version == 8 || _vm->_game.heversion >= 60) transpStrip = true; - + if (vs->hasTwoBuffers) { byte *frontBuf = (byte *)vs->pixels + y * vs->pitch + x * 8; if (lightsOn) @@ -1843,7 +1843,7 @@ void Gdi::drawBMAPBg(const byte *ptr, VirtScreen *vs) { // in decompressBitmap call drawStripHE() _decomp_shr = code % 10; _decomp_mask = 0xFF >> (8 - _decomp_shr); - + switch (code) { case 134: case 135: @@ -1933,7 +1933,7 @@ void Gdi::drawBMAPObject(const byte *ptr, VirtScreen *vs, int obj, int x, int y, rect1.right -= rect2.left; rect1.top -= rect2.top; rect1.bottom -= rect2.top; - + ((ScummEngine_v71he *)_vm)->restoreBackgroundHE(rect1); } } @@ -1962,13 +1962,13 @@ void ScummEngine_v70he::restoreBackgroundHE(Common::Rect rect, int dirtybit) { const int rw = rect.width(); const int rh = rect.height(); - + if (rw == 0 || rh == 0) return; src = _virtscr[kMainVirtScreen].getBackPixels(rect.left, rect.top); dst = _virtscr[kMainVirtScreen].getPixels(rect.left, rect.top); - + assert(rw <= _screenWidth && rw > 0); assert(rh <= _screenHeight && rh > 0); blit(dst, _virtscr[kMainVirtScreen].pitch, src, _virtscr[kMainVirtScreen].pitch, rw, rh); @@ -1983,7 +1983,7 @@ void Gdi::resetBackground(int top, int bottom, int strip) { VirtScreen *vs = &_vm->_virtscr[kMainVirtScreen]; byte *backbuff_ptr, *bgbak_ptr; int numLinesToProcess; - + if (top < 0) top = 0; @@ -2031,7 +2031,7 @@ bool Gdi::decompressBitmap(byte *dst, int dstPitch, const byte *src, int numLine bool transpStrip = false; _decomp_shr = code % 10; _decomp_mask = 0xFF >> (8 - _decomp_shr); - + switch (code) { case 1: drawStripRaw(dst, dstPitch, src, numLinesToProcess, false); @@ -2154,7 +2154,7 @@ bool Gdi::decompressBitmap(byte *dst, int dstPitch, const byte *src, int numLine default: error("Gdi::decompressBitmap: default case %d", code); } - + return transpStrip; } @@ -2236,7 +2236,7 @@ void Gdi::decompressMaskImgOr(byte *dst, const byte *src, int height) const { while (height) { b = *src++; - + if (b & 0x80) { b &= 0x7F; c = *src++; @@ -2650,7 +2650,7 @@ StripTable *GdiV2::generateStripTable(const byte *src, int width, int height, St x = 0; y = height; width /= 8; - + for (;;) { length = *src++; const byte runFlag = length & 0x80; @@ -2684,7 +2684,7 @@ void Gdi::drawStripEGA(byte *dst, int dstPitch, const byte *src, int height) con while (x < 8) { color = *src++; - + if (color & 0x80) { run = color & 0x3f; @@ -2723,7 +2723,7 @@ void Gdi::drawStripEGA(byte *dst, int dstPitch, const byte *src, int height) con if (run == 0) { run = *src++; } - + for (z = 0; z < run; z++) { *(dst + y * dstPitch + x) = _roomPalette[color & 0xf] + _paletteMod; @@ -2751,12 +2751,12 @@ void Gdi::drawStripHE(byte *dst, int dstPitch, const byte *src, int width, int h uint32 dataBit, data; byte color; int shift; - + color = *src++; data = READ_LE_UINT24(src); src += 3; shift = 24; - + int x = width; while (1) { if (!transpCheck || color != _transparentColor) @@ -3197,10 +3197,10 @@ void ScummEngine::fadeOut(int effect) { // to get cleared. This fixes glitches, at least, in the first cutscenes // when bypassed of FT and TheDig. if ((_game.version == 7 || _screenEffectFlag) && effect != 0) { - + // Fill screen 0 with black memset(vs->getPixels(0, 0), 0, vs->pitch * vs->h); - + // Fade to black with the specified effect, if any. switch (effect) { case 1: @@ -3305,7 +3305,7 @@ void ScummEngine::transitionEffect(int a) { /** * Update width*height areas of the screen, in random order, until the whole * screen has been updated. For instance: - * + * * dissolveEffect(1, 1) produces a pixel-by-pixel dissolve * dissolveEffect(8, 8) produces a square-by-square dissolve * dissolveEffect(virtsrc[0].width, 1) produces a line-by-line dissolve @@ -3384,7 +3384,7 @@ void ScummEngine::dissolveEffect(int width, int height) { blits = 0; blits_before_refresh = (3 * w * h) / 25; - + // Speed up the effect for CD Loom since it uses it so often. I don't // think the original had any delay at all, so on modern hardware it // wasn't even noticeable. diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 3c7d742ba2..24badd2685 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/he/animation_he.h" #include "scumm/he/intern_he.h" @@ -58,11 +58,11 @@ int MoviePlayer::load(const char *filename, int flags, int image) { // Change file extension to dxa sprintf(videoName, "%s.dxa", baseName); - + if (!loadFile(videoName)) { warning("Failed to load video file %s", videoName); return -1; - } + } debug(1, "Playing video %s", videoName); // Skip sound tag @@ -101,7 +101,7 @@ void MoviePlayer::handleNextFrame() { copyFrameToBuffer(dst, 0, 0, _vm->_screenWidth); } else if (_flags & 1) { copyFrameToBuffer(pvs->getBackPixels(0, 0), 0, 0, _vm->_screenWidth); - + Common::Rect imageRect(_width, _height); _vm->restoreBackgroundHE(imageRect); } else { diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index 737e2772ff..e611c85e9d 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "sound/audiostream.h" #include "sound/mixer.h" diff --git a/engines/scumm/he/floodfill_he.cpp b/engines/scumm/he/floodfill_he.cpp index ea2043d69f..4fdfe139fc 100644 --- a/engines/scumm/he/floodfill_he.cpp +++ b/engines/scumm/he/floodfill_he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/he/floodfill_he.h" #include "scumm/he/intern_he.h" @@ -31,7 +31,7 @@ #include "scumm/scumm.h" namespace Scumm { - + static bool floodFillPixelCheck(int x, int y, const FloodFillState *ffs) { int diffColor = ffs->color1 - ffs->color2; if (x >= 0 && x < ffs->dst_w && y >= 0 && y < ffs->dst_h) { @@ -81,10 +81,10 @@ static void floodFillAddLine(FloodFillLine **ffl, int y, int x1, int x2, int dy) static void floodFillProcess(int x, int y, FloodFillState *ffs, FloodFillPixelCheckCallback pixelCheckCallback) { ffs->dstBox.left = ffs->dstBox.top = 12345; ffs->dstBox.right = ffs->dstBox.bottom = -12345; - + FloodFillLine **fillLineCur = &ffs->fillLineTableCur; FloodFillLine **fillLineEnd = &ffs->fillLineTableEnd; - + assert(*fillLineCur < *fillLineEnd); if (ffs->srcBox.top <= y + 1 && ffs->srcBox.bottom >= y + 1) { (*fillLineCur)->y = y; @@ -93,7 +93,7 @@ static void floodFillProcess(int x, int y, FloodFillState *ffs, FloodFillPixelCh (*fillLineCur)->inc = 1; (*fillLineCur)++; } - + assert(*fillLineCur < *fillLineEnd); if (ffs->srcBox.top <= y && ffs->srcBox.bottom >= y) { (*fillLineCur)->y = y + 1; @@ -105,7 +105,7 @@ static void floodFillProcess(int x, int y, FloodFillState *ffs, FloodFillPixelCh assert(ffs->fillLineTable <= *fillLineCur); FloodFillLine **fillLineStart = fillLineCur; - + while (ffs->fillLineTable < *fillLineStart) { Common::Rect r; int x_start; @@ -190,7 +190,7 @@ void floodFill(FloodFillParameters *ffp, ScummEngine_v90he *vm) { Common::Rect r; r.left = r.top = 12345; r.right = r.bottom = -12345; - + FloodFillState *ffs = new FloodFillState; ffs->fillLineTableCount = vs->h * 2; ffs->fillLineTable = new FloodFillLine[ffs->fillLineTableCount]; @@ -201,25 +201,25 @@ void floodFill(FloodFillParameters *ffp, ScummEngine_v90he *vm) { ffs->srcBox = ffp->box; ffs->fillLineTableCur = &ffs->fillLineTable[0]; ffs->fillLineTableEnd = &ffs->fillLineTable[ffs->fillLineTableCount]; - + if (ffp->x < 0 || ffp->y < 0 || ffp->x >= vs->w || ffp->y >= vs->h) { ffs->color1 = color; } else { ffs->color1 = *(dst + ffp->y * vs->w + ffp->x); } - + debug(5, "floodFill() x=%d y=%d color1=%d ffp->flags=0x%X", ffp->x, ffp->y, ffs->color1, ffp->flags); if (ffs->color1 != color) { floodFillProcess(ffp->x, ffp->y, ffs, floodFillPixelCheck); r = ffs->dstBox; } r.debugPrint(5, "floodFill() dirty_rect"); - + delete[] ffs->fillLineTable; delete ffs; - + vm->VAR(119) = 1; - + if (r.left <= r.right && r.top <= r.bottom) { if (ffp->flags & 0x8000) { vm->restoreBackgroundHE(r); @@ -271,19 +271,19 @@ void Wiz::fillWizFlood(const WizParameters *params) { ffs->srcBox = imageRect; ffs->fillLineTableCur = &ffs->fillLineTable[0]; ffs->fillLineTableEnd = &ffs->fillLineTable[ffs->fillLineTableCount]; - + if (px < 0 || py < 0 || px >= w || py >= h) { ffs->color1 = color; } else { ffs->color1 = *(wizd + py * w + px); } - + debug(0, "floodFill() x=%d y=%d color1=%d", px, py, ffs->color1); if (ffs->color1 != color) { floodFillProcess(px, py, ffs, floodFillPixelCheck); } - + delete[] ffs->fillLineTable; delete ffs; } diff --git a/engines/scumm/he/logic_he.cpp b/engines/scumm/he/logic_he.cpp index 7a0869ad24..49acde9465 100644 --- a/engines/scumm/he/logic_he.cpp +++ b/engines/scumm/he/logic_he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/he/intern_he.h" #include "scumm/he/logic_he.h" diff --git a/engines/scumm/he/logic_he.h b/engines/scumm/he/logic_he.h index af5457295b..4f850e0f32 100644 --- a/engines/scumm/he/logic_he.h +++ b/engines/scumm/he/logic_he.h @@ -26,7 +26,7 @@ #if !defined(SCUMM_HE_LOGIC_HE_H) && !defined(DISABLE_HE) #define SCUMM_HE_LOGIC_HE_H -#include "common/stdafx.h" + namespace Scumm { diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp index 9efc16c60b..aac7bb5848 100644 --- a/engines/scumm/he/palette_he.cpp +++ b/engines/scumm/he/palette_he.cpp @@ -22,7 +22,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "scumm/scumm.h" #include "scumm/he/intern_he.h" diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp index 651c150cee..9bebd7a47d 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/file.h" #include "scumm/he/intern_he.h" @@ -668,7 +668,7 @@ bool Win32ResExtractor::read_library(WinLibrary *fi) { DOSImageHeader *mz_header = MZ_HEADER(fi->memory); RETURN_IF_BAD_POINTER(false, mz_header->lfanew); - + // Apply endian fix (currently only lfanew is used from the DOSImageHeader, // so we don't bother to 'fix' the rest). LE32(mz_header->lfanew); @@ -726,7 +726,7 @@ bool Win32ResExtractor::read_library(WinLibrary *fi) { error("%s: file contains no resources", fi->file->name()); return false; } - + fix_win32_image_data_directory(dir); fi->first_resource = fi->memory + dir->virtual_address; @@ -1154,7 +1154,7 @@ int MacResExtractor::extractResource(int id, byte **buf) { // Some programs write it as .bin. Try that too if (!in.open(_fileName)) { Common::String tmp(_fileName); - + _fileName += ".bin"; if (!in.open(_fileName)) { @@ -1749,7 +1749,7 @@ void ScummEngine_v80he::createSound(int snd1id, int snd2id) { src = sdat2Ptr + 8; dst = sdat1Ptr + 8 + _sndPtrOffs; len = sdat2size; - + memcpy(dst, src, len); _sndPtrOffs += sdat2size; @@ -1758,14 +1758,14 @@ void ScummEngine_v80he::createSound(int snd1id, int snd2id) { src = sdat2Ptr + 8; dst = sdat1Ptr + 8 + _sndPtrOffs; len = sdat1size; - + memcpy(dst, src, len); if (sdat2size != sdat1size) { src = sdat2Ptr + 8 + sdat1size; dst = sdat1Ptr + 8; len = sdat2size - sdat1size; - + memcpy(dst, src, len); } diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index e234dd02fc..273f6c6920 100644 --- a/engines/scumm/he/script_v100he.cpp +++ b/engines/scumm/he/script_v100he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" @@ -1681,7 +1681,7 @@ void ScummEngine_v100he::o100_setSystemMessage() { // behavior can occur, from strange wrong titles, up to crashes (happens // under Mac OS X). // - // Possible fixes/workarounds: + // Possible fixes/workarounds: // - Simply stop using this. It's a rather unimportant "feature" anyway. // - Try to translate the text to ASCII. // - Refine OSystem to accept window captions that are non-ASCII, e.g. diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp index 0b9c94fe18..2909a44223 100644 --- a/engines/scumm/he/script_v60he.cpp +++ b/engines/scumm/he/script_v60he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/savefile.h" #include "scumm/actor.h" diff --git a/engines/scumm/he/script_v70he.cpp b/engines/scumm/he/script_v70he.cpp index 1ced349225..b2009452b4 100644 --- a/engines/scumm/he/script_v70he.cpp +++ b/engines/scumm/he/script_v70he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/system.h" @@ -1105,7 +1105,7 @@ void ScummEngine_v70he::o70_setSystemMessage() { // behavior can occur, from strange wrong titles, up to crashes (happens // under Mac OS X). // - // Possible fixes/workarounds: + // Possible fixes/workarounds: // - Simply stop using this. It's a rather unimportant "feature" anyway. // - Try to translate the text to ASCII. // - Refine OSystem to accept window captions that are non-ASCII, e.g. diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index 8953d55546..5db2ae74ec 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/savefile.h" @@ -2256,7 +2256,7 @@ void ScummEngine_v72he::o72_setSystemMessage() { // behavior can occur, from strange wrong titles, up to crashes (happens // under Mac OS X). // - // Possible fixes/workarounds: + // Possible fixes/workarounds: // - Simply stop using this. It's a rather unimportant "feature" anyway. // - Try to translate the text to ASCII. // - Refine OSystem to accept window captions that are non-ASCII, e.g. diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp index a62b65787c..d4a11240bd 100644 --- a/engines/scumm/he/script_v80he.cpp +++ b/engines/scumm/he/script_v80he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-file.h" #include "common/config-manager.h" diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp index a717eecc50..e344db21be 100644 --- a/engines/scumm/he/script_v90he.cpp +++ b/engines/scumm/he/script_v90he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/actor.h" #include "scumm/charset.h" diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index d0a16390dd..b074f644e0 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/actor.h" #include "scumm/file.h" #include "scumm/imuse/imuse.h" @@ -57,7 +57,7 @@ SoundHE::SoundHE(ScummEngine *parent, Audio::Mixer *mixer) _heMusicTracks(0) { memset(_heChannel, 0, sizeof(_heChannel)); -} +} SoundHE::~SoundHE() { free(_heMusic); @@ -81,7 +81,7 @@ void SoundHE::addSoundToQueue2(int sound, int heOffset, int heChannel, int heFla if (_soundQue2[i].sound == sound && !(heFlags & 2)) return; } - + Sound::addSoundToQueue2(sound, heOffset, heChannel, heFlags); } diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp index 15698dedba..1e694ff067 100644 --- a/engines/scumm/he/sprite_he.cpp +++ b/engines/scumm/he/sprite_he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/he/intern_he.h" #include "scumm/resource.h" diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index a99f3b1ad5..97995fb155 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "graphics/cursorman.h" diff --git a/engines/scumm/help.cpp b/engines/scumm/help.cpp index 16605605e9..4752cfa43a 100644 --- a/engines/scumm/help.cpp +++ b/engines/scumm/help.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/str.h" #include "common/util.h" diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index e604222733..1da6bdf627 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "base/version.h" diff --git a/engines/scumm/imuse/imuse_part.cpp b/engines/scumm/imuse/imuse_part.cpp index ffe572aaa9..c581f4ba3b 100644 --- a/engines/scumm/imuse/imuse_part.cpp +++ b/engines/scumm/imuse/imuse_part.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/util.h" #include "scumm/imuse/imuse_internal.h" @@ -232,7 +232,7 @@ void Part::noteOn(byte note, byte velocity) { mc = _player->getMidiDriver()->getPercussionChannel(); if (!mc) return; - + // FIXME: The following is evil, EVIL!!! Either prev_vol_eff is // actually meant to be a member of the Part class (i.e. each // instance of Part keeps a separate copy of it); or it really diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index b6ed9f8d25..253bd919c6 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/util.h" #include "engines/engine.h" diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp index b6ed064bc9..cadafd412a 100644 --- a/engines/scumm/imuse/instrument.cpp +++ b/engines/scumm/imuse/instrument.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/saveload.h" #include "scumm/imuse/instrument.h" diff --git a/engines/scumm/imuse/instrument.h b/engines/scumm/imuse/instrument.h index e8914e899e..4d4e40c528 100644 --- a/engines/scumm/imuse/instrument.h +++ b/engines/scumm/imuse/instrument.h @@ -25,7 +25,7 @@ #ifndef SCUMM_IMUSE_INSTRUMENT_H #define SCUMM_IMUSE_INSTRUMENT_H -#include "common/stdafx.h" + #include "common/scummsys.h" class MidiChannel; diff --git a/engines/scumm/imuse/sysex.h b/engines/scumm/imuse/sysex.h index adffc24e88..bff80de9e7 100644 --- a/engines/scumm/imuse/sysex.h +++ b/engines/scumm/imuse/sysex.h @@ -25,7 +25,7 @@ #ifndef SCUMM_IMUSE_SYSEX_H #define SCUMM_IMUSE_SYSEX_H -#include "common/stdafx.h" + #include "common/util.h" namespace Scumm { diff --git a/engines/scumm/imuse/sysex_samnmax.cpp b/engines/scumm/imuse/sysex_samnmax.cpp index 0586db25ee..cdae767abf 100644 --- a/engines/scumm/imuse/sysex_samnmax.cpp +++ b/engines/scumm/imuse/sysex_samnmax.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" diff --git a/engines/scumm/imuse/sysex_scumm.cpp b/engines/scumm/imuse/sysex_scumm.cpp index bee790e009..87873d1693 100644 --- a/engines/scumm/imuse/sysex_scumm.cpp +++ b/engines/scumm/imuse/sysex_scumm.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp index 6d2e7dd217..776b840145 100644 --- a/engines/scumm/imuse_digi/dimuse.cpp +++ b/engines/scumm/imuse_digi/dimuse.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/system.h" #include "common/timer.h" diff --git a/engines/scumm/imuse_digi/dimuse_bndmgr.cpp b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp index 03b3e4e74a..f0b4bc131b 100644 --- a/engines/scumm/imuse_digi/dimuse_bndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/scummsys.h" #include "scumm/scumm.h" #include "scumm/util.h" diff --git a/engines/scumm/imuse_digi/dimuse_codecs.cpp b/engines/scumm/imuse_digi/dimuse_codecs.cpp index b79c7111f9..8ff8bd2461 100644 --- a/engines/scumm/imuse_digi/dimuse_codecs.cpp +++ b/engines/scumm/imuse_digi/dimuse_codecs.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/endian.h" #include "common/util.h" diff --git a/engines/scumm/imuse_digi/dimuse_music.cpp b/engines/scumm/imuse_digi/dimuse_music.cpp index bdfc4bf4fa..af4966b2ff 100644 --- a/engines/scumm/imuse_digi/dimuse_music.cpp +++ b/engines/scumm/imuse_digi/dimuse_music.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/scummsys.h" #include "scumm/scumm.h" #include "scumm/imuse_digi/dimuse.h" diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp index ddc0cd5107..0895be540b 100644 --- a/engines/scumm/imuse_digi/dimuse_script.cpp +++ b/engines/scumm/imuse_digi/dimuse_script.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/system.h" #include "common/timer.h" @@ -403,7 +403,7 @@ void IMuseDigital::stopAllSounds() { delete track->streamSou; track->streamSou = NULL; } - + // Mark the track as unused track->used = false; } diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index be80cb73e8..51f5c76815 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/util.h" diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h index e4e2e795a2..f38589df3d 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.h +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h @@ -25,7 +25,7 @@ #ifndef SCUMM_IMUSE_DIGI_SNDMGR_H #define SCUMM_IMUSE_DIGI_SNDMGR_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "sound/audiostream.h" #include "scumm/imuse_digi/dimuse_bndmgr.h" diff --git a/engines/scumm/imuse_digi/dimuse_tables.cpp b/engines/scumm/imuse_digi/dimuse_tables.cpp index 9c56063557..e190e5a755 100644 --- a/engines/scumm/imuse_digi/dimuse_tables.cpp +++ b/engines/scumm/imuse_digi/dimuse_tables.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "scumm/imuse_digi/dimuse.h" namespace Scumm { diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index 987e1bc3c9..86570f478d 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/timer.h" #include "scumm/actor.h" @@ -321,7 +321,7 @@ IMuseDigital::Track *IMuseDigital::cloneToFadeOutTrack(const Track *track, int f } fadeTrack = _track[track->trackId + MAX_DIGITAL_TRACKS]; - + // Clone the settings of the given track memcpy(fadeTrack, track, sizeof(Track)); diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 94fafc78de..6b45b7b415 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/events.h" @@ -322,7 +322,7 @@ void ScummEngine::processInput() { if (!lastKeyHit.ascii) return; - + processKeyboard(lastKeyHit); } @@ -334,7 +334,7 @@ void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) { if (lastKeyHit.keycode == Common::KEYCODE_F1 && lastKeyHit.flags == 0) { lastKeyHit = Common::KeyState(Common::KEYCODE_F5, 319); } - + // Alt-F5 should bring up the original save/load dialog, so map it to F1. if (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.flags == Common::KBD_ALT) { lastKeyHit = Common::KeyState(Common::KEYCODE_F1, 315); @@ -491,7 +491,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) { } else if (cutsceneExitKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_ESCAPE && lastKeyHit.flags == 0)) { abortCutscene(); - + // FIXME: Is the following line really necessary? _mouseAndKeyboardStat = VAR(VAR_CUTSCENEEXIT_KEY); @@ -522,7 +522,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) { // Display the talk speed ValueDisplayDialog dlg("Subtitle speed: ", 0, 9, 9 - _defaultTalkDelay, '+', '-'); _defaultTalkDelay = 9 - runDialog(dlg); - + // Save the new talkspeed value to ConfMan setTalkspeed(_defaultTalkDelay); diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp index af09daff96..912ff97d19 100644 --- a/engines/scumm/insane/insane.cpp +++ b/engines/scumm/insane/insane.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" diff --git a/engines/scumm/insane/insane_ben.cpp b/engines/scumm/insane/insane_ben.cpp index 1732ce0b11..4f29c85d77 100644 --- a/engines/scumm/insane/insane_ben.cpp +++ b/engines/scumm/insane/insane_ben.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp index 3866cf230d..a152a675ef 100644 --- a/engines/scumm/insane/insane_enemy.cpp +++ b/engines/scumm/insane/insane_enemy.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" @@ -98,7 +98,7 @@ int32 Insane::enemy0handler(int32 actor1, int32 actor2, int32 probability) { act2damage = _actor[actor2].damage; // ebp act1x = _actor[actor1].x; // esi act2x = _actor[actor2].x; // edi - + if (!_actor[actor1].defunct) { if (_enHdlVar[EN_ROTT1][1] > _enHdlVar[EN_ROTT1][2]) { if (act1damage - act2damage >= 30) { @@ -262,7 +262,7 @@ int32 Insane::enemy1handler(int32 actor1, int32 actor2, int32 probability) { act2damage = _actor[actor2].damage; // ebp act1x = _actor[actor1].x; // esi act2x = _actor[actor2].x; // edi - + if (!_actor[actor1].defunct) { if (_enHdlVar[EN_ROTT2][1] > _enHdlVar[EN_ROTT2][2]) { if (act1damage - act2damage >= 30) { @@ -556,7 +556,7 @@ int32 Insane::enemy3handler(int32 actor1, int32 actor2, int32 probability) { act2damage = _actor[actor2].damage; // ebp act1x = _actor[actor1].x; // esi act2x = _actor[actor2].x; // edi - + if (!_actor[actor1].defunct) { if (_enHdlVar[EN_VULTF1][1] > _enHdlVar[EN_VULTF1][2]) { if ((act1damage - act2damage >= 30) && (_vm->_rnd.getRandomNumber(probability - 1) != 1)) @@ -664,7 +664,7 @@ int32 Insane::enemy3handler(int32 actor1, int32 actor2, int32 probability) { } _enHdlVar[EN_VULTF1][7] = _enHdlVar[EN_VULTF1][8]; } - + } _enHdlVar[EN_VULTF1][1]++; _enHdlVar[EN_VULTF1][3]++; @@ -882,7 +882,7 @@ int32 Insane::enemy5handler(int32 actor1, int32 actor2, int32 probability) { act1damage = _actor[actor1].damage; // ebx act1x = _actor[actor1].x; // esi act2x = _actor[actor2].x; // ebp - + dist = ABS(act1x - act2x); if (weaponMaxRange(actor1) >= dist) { @@ -1187,7 +1187,7 @@ int32 Insane::enemy7handler(int32 actor1, int32 actor2, int32 probability) { goto _labelA; } } - + if (weaponMaxRange(actor1) <= dist) { if (act2x < act1x) _actor[actor1].cursorX = -101; @@ -1342,7 +1342,7 @@ void Insane::turnEnemy(bool battle) { if (battle) buttons = actionEnemy(); - debug(5, "11:%d 12:%d 13:%d 10:%d", _actor[1].act[1].state, + debug(5, "11:%d 12:%d 13:%d 10:%d", _actor[1].act[1].state, _actor[1].act[2].state, _actor[1].act[3].state, _actor[1].act[0].state); actor11Reaction(buttons); actor12Reaction(buttons); @@ -1361,7 +1361,7 @@ void Insane::actor11Reaction(int32 buttons) { setEnemyAnimation(1, 6); _actor[1].act[1].state = 41; } - + if (_actor[1].cursorX >= -100) { setEnemyAnimation(1, 7); _actor[1].act[1].state = 40; @@ -1388,7 +1388,7 @@ void Insane::actor11Reaction(int32 buttons) { setEnemyAnimation(1, 8); _actor[1].act[1].state = 39; } - + if (_actor[1].field_8 == 48) _actor[1].tilt = 0; else @@ -1445,7 +1445,7 @@ void Insane::actor11Reaction(int32 buttons) { setEnemyAnimation(1, 12); _actor[1].act[1].state = 57; } - + if (_actor[1].cursorX <= 100) { setEnemyAnimation(1, 11); _actor[1].act[1].state = 56; @@ -1456,13 +1456,13 @@ void Insane::actor11Reaction(int32 buttons) { _actor[1].x += _actor[1].cursorX / 32; break; } - + tmpx = _actor[1].x; tmpy = _actor[1].y + _actor[1].y1; if (_actor[1].act[1].room) smlayer_putActor(1, 1, tmpx, tmpy, _smlayer_room2); - else + else smlayer_putActor(1, 1, tmpx, tmpy, _smlayer_room); _actor[1].animWeaponClass = _actor[1].weaponClass; @@ -1529,7 +1529,7 @@ void Insane::chooseEnemyWeaponAnim(int32 buttons) { default: switchEnemyWeapon(); } - + _weaponEnemyJustSwitched = true; } else { _weaponEnemyJustSwitched = false; @@ -1583,7 +1583,7 @@ void Insane::setEnemyState(void) { _actor[1].act[2].state = 98; else _actor[1].act[2].state = 99; - + return; } @@ -1803,7 +1803,7 @@ void Insane::actor12Reaction(int32 buttons) { smlayer_setActorFacing(1, 2, 20, 180); _actor[1].act[2].state = 16; } - break; + break; default: smlayer_setActorFacing(1, 2, 20, 180); _actor[1].act[2].state = 16; @@ -1971,7 +1971,7 @@ void Insane::actor12Reaction(int32 buttons) { } else { smlayer_setActorFacing(1, 2, 20, 180); _actor[1].act[2].state = 24; - + if (!_actor[1].field_54) smlayer_startSfx(246); } @@ -2065,7 +2065,7 @@ void Insane::actor12Reaction(int32 buttons) { case 34: smlayer_setActorLayer(1, 2, 5); _actor[1].kicking = false; - + if (!smlayer_actorNeedRedraw(1, 2)) { setEnemyState(); _actor[1].act[2].tilt = 0; @@ -2077,7 +2077,7 @@ void Insane::actor12Reaction(int32 buttons) { case 35: smlayer_setActorLayer(1, 2, 5); _actor[1].kicking = false; - + if (!smlayer_actorNeedRedraw(1, 2)) { switchEnemyWeapon(); _actor[1].act[2].tilt = 0; @@ -2386,7 +2386,7 @@ void Insane::actor12Reaction(int32 buttons) { smlayer_setActorLayer(1, 2, 4); _actor[1].kicking = false; if (_actor[1].act[2].frame >= 19) { - queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, + queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, _continueFrame1, 1300); _actor[1].act[2].state = 96; } @@ -2450,7 +2450,7 @@ void Insane::actor12Reaction(int32 buttons) { _actor[1].act[2].state = 103; case 103: _actor[1].kicking = false; - + if (_actor[1].act[2].frame >= 18 || ((_actor[1].x < 50 || _actor[1].x > 270) && _actor[1].act[2].frame >= 9)) { _enemy[EN_CAVEFISH].isEmpty = 1; @@ -2527,7 +2527,7 @@ void Insane::actor12Reaction(int32 buttons) { case 114: smlayer_setActorLayer(1, 2, 25); _actor[1].kicking = false; - + if (_actor[1].act[2].frame >= 16 || ((_actor[1].x < 50 || _actor[1].x > 270) && (_actor[1].act[2].frame >= 8))) { queueSceneSwitch(11, 0, _enemy[_currEnemy].filename, 64, 0, 0, 0); @@ -2549,7 +2549,7 @@ void Insane::actor12Reaction(int32 buttons) { case 116: smlayer_setActorLayer(1, 2, 25); _actor[1].kicking = false; - + if (_actor[1].act[2].frame >= 17 || ((_actor[1].x < 50 || _actor[1].x > 270) && _actor[1].act[2].frame >= 8)) { queueSceneSwitch(11, 0, _enemy[_currEnemy].filename, 64, 0, 0, 0); @@ -2607,7 +2607,7 @@ void Insane::actor13Reaction(int32 buttons) { case 52: if (_actor[1].runningSound) smlayer_stopSound(_actor[1].runningSound); - + if (_currScenePropIdx) shutCurrentScene(); @@ -2780,7 +2780,7 @@ int32 Insane::actionEnemy(void) { if (_actor[0].x + 90 > _actor[1].x) _actor[1].x = _actor[0].x + 90; } - + if (_actor[1].x < 0) { _actor[1].x = 0; _actor[1].x1 = -_actor[1].x1; diff --git a/engines/scumm/insane/insane_iact.cpp b/engines/scumm/insane/insane_iact.cpp index cc1be928bb..19f9c5aa80 100644 --- a/engines/scumm/insane/insane_iact.cpp +++ b/engines/scumm/insane/insane_iact.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" @@ -115,7 +115,7 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12, par11 = b.readUint16LE(); // +20 cx tmp = b.readUint16LE(); // +22 par13 = b.readUint16LE(); // +24 ax - + if (par13 > _actor[0].x || par11 < _actor[0].x) { _tiresRustle = true; _actor[0].x1 = -_actor[0].x1; @@ -130,12 +130,12 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12, case 6: switch (par2) { case 38: - smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3, + smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3, _smush_iconsNut, 7, 0, 0); _roadBranch = true; _iactSceneId = par4; break; - case 25: + case 25: _roadBumps = true; _actor[0].y1 = -_actor[0].y1; break; @@ -174,7 +174,7 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12, if (_approachAnim < 0 || _approachAnim > 4) if (readArray(8)) { - smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-18, 3, + smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-18, 3, _smush_iconsNut, 20, 0, 0); _benHasGoggles = true; } @@ -234,7 +234,7 @@ void Insane::chooseEnemy(void) { } if (!notfound) { continue; - } + } } else { j = 0; do { @@ -252,11 +252,11 @@ void Insane::chooseEnemy(void) { } while (j < 9 && !notfound); if (!notfound) { _metEnemiesListTail = 0; - count = 0; + count = 0; continue; } } - + ++_metEnemiesListTail; assert(_metEnemiesListTail < ARRAYSIZE(_metEnemiesList)); _metEnemiesList[_metEnemiesListTail] = en2; @@ -350,8 +350,8 @@ void Insane::iactScene4(byte *renderBitmap, int32 codecparam, int32 setupsan12, case 6: switch (par2) { case 38: - - smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-13, 3, + + smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-13, 3, _smush_icons2Nut, 10, 0, 0); _roadBranch = true; _iactSceneId = par4; @@ -373,16 +373,16 @@ void Insane::iactScene4(byte *renderBitmap, int32 codecparam, int32 setupsan12, smush_setToFinish(); break; - case 25: + case 25: if (readArray(5) == 0) return; - + _carIsBroken = true; smlayer_drawSomething(renderBitmap, codecparam, 160-13, 20-10, 3, // QW _smush_icons2Nut, 8, 0, 0); break; case 11: - smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3, + smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3, _smush_icons2Nut, 9, 0, 0); _roadBranch = true; _iactSceneId = par4; @@ -436,7 +436,7 @@ void Insane::iactScene6(byte *renderBitmap, int32 codecparam, int32 setupsan12, case 6: switch (par2) { case 38: - smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-13, 3, + smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-13, 3, _smush_icons2Nut, 10, 0, 0); _roadBranch = true; _iactSceneId = par4; @@ -458,16 +458,16 @@ void Insane::iactScene6(byte *renderBitmap, int32 codecparam, int32 setupsan12, smush_setToFinish(); break; - case 25: + case 25: if (readArray(5) == 0) return; - + _carIsBroken = true; smlayer_drawSomething(renderBitmap, codecparam, 160-13, 20-10, 3, //QW _smush_icons2Nut, 8, 0, 0); break; case 11: - smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3, + smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3, _smush_icons2Nut, 9, 0, 0); _roadBranch = true; _iactSceneId = par4; @@ -492,7 +492,7 @@ void Insane::iactScene17(byte *renderBitmap, int32 codecparam, int32 setupsan12, case 6: switch (par2) { case 38: - smlayer_drawSomething(renderBitmap, codecparam, 28, 48, 1, + smlayer_drawSomething(renderBitmap, codecparam, 28, 48, 1, _smush_iconsNut, 6, 0, 0); _roadBranch = true; _iactSceneId = par4; @@ -506,7 +506,7 @@ void Insane::iactScene17(byte *renderBitmap, int32 codecparam, int32 setupsan12, _objectDetected = true; break; case 10: - smlayer_drawSomething(renderBitmap, codecparam, 28, 48, 1, + smlayer_drawSomething(renderBitmap, codecparam, 28, 48, 1, _smush_iconsNut, 6, 0, 0); if (_counter1 <= 4) { if (_counter1 == 4) diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp index 0cf6623664..792739d76a 100644 --- a/engines/scumm/insane/insane_scenes.cpp +++ b/engines/scumm/insane/insane_scenes.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" @@ -1226,7 +1226,7 @@ void Insane::postCase6(byte *renderBitmap, int32 codecparam, int32 setupsan12, flu = &_fluConf[7 + _iactSceneId2]; else flu = &_fluConf[0 + _iactSceneId2]; - + if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC)) queueSceneSwitch(1, 0, "minedriv.san", 64, 0, 0, 0); else diff --git a/engines/scumm/midiparser_eup.cpp b/engines/scumm/midiparser_eup.cpp index 9d26d1232b..592d43f7fe 100644 --- a/engines/scumm/midiparser_eup.cpp +++ b/engines/scumm/midiparser_eup.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "sound/midiparser.h" #include "sound/mididrv.h" #include "common/util.h" diff --git a/engines/scumm/midiparser_ro.cpp b/engines/scumm/midiparser_ro.cpp index fff4f616c0..858a852c22 100644 --- a/engines/scumm/midiparser_ro.cpp +++ b/engines/scumm/midiparser_ro.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "sound/midiparser.h" #include "sound/mididrv.h" #include "common/util.h" diff --git a/engines/scumm/nut_renderer.cpp b/engines/scumm/nut_renderer.cpp index 4d5097cf61..71182ca7a0 100644 --- a/engines/scumm/nut_renderer.cpp +++ b/engines/scumm/nut_renderer.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/file.h" #include "scumm/nut_renderer.h" @@ -118,7 +118,7 @@ void NutRenderer::loadFont(const char *filename) { uint32 offset = 0; uint32 decodedLength = 0; int l; - + _paletteMap = new byte[256]; for (l = 0; l < 256; l++) { _paletteMap[l] = 0; diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 128270538d..d3e96e5bef 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/actor.h" #include "scumm/bomp.h" @@ -113,7 +113,7 @@ void ScummEngine::setOwnerOf(int obj, int owner) { if (owner == 0) { clearOwnerOf(obj); - + // FIXME: See bug #1535358 and many others. Essentially, the following // code, while matching disasm of various versions of the SCUMM engine, // is total bullocks, and leads to odd crashes due to out-of-bounds @@ -125,7 +125,7 @@ void ScummEngine::setOwnerOf(int obj, int owner) { // The bad code: // if (ss->where == WIO_INVENTORY && _inventory[ss->number] == obj) { // That check makes no sense at all: _inventory only contains 80 items, - // which are in the order the player picked up items. We can only + // which are in the order the player picked up items. We can only // guess that the SCUMM coders meant to write // if (ss->where == WIO_INVENTORY && ss->number == obj) { // which would ensure that an object script that nukes itself gets @@ -133,10 +133,10 @@ void ScummEngine::setOwnerOf(int obj, int owner) { // lead to new regressions. // Another fix would be to completely remove this check, which should // not cause much problems, since it'll only succeed by pure chance. - // + // // For now we follow a more defensive route: We perform the check // if ss->number is small enough. - + ss = &vm.slot[_currentScript]; if (ss->where == WIO_INVENTORY) { if (ss->number < _numInventory && _inventory[ss->number] == obj) { @@ -174,7 +174,7 @@ void ScummEngine::clearOwnerOf(int obj) { } } } else { - + // Alternatively, scan the inventory to see if the object is in there... for (i = 0; i < _numInventory; i++) { if (_inventory[i] == obj) { @@ -182,7 +182,7 @@ void ScummEngine::clearOwnerOf(int obj) { // Found the object! Nuke it from the inventory. _res->nukeResource(rtInventory, i); _inventory[i] = 0; - + // Now fill up the gap removing the object from the inventory created. a = _inventory; for (i = 0; i < _numInventory - 1; i++, a++) { diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp index a29cf5fdaa..39bac051e8 100644 --- a/engines/scumm/palette.cpp +++ b/engines/scumm/palette.cpp @@ -22,7 +22,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "common/util.h" diff --git a/engines/scumm/player_mod.cpp b/engines/scumm/player_mod.cpp index 9005376187..71842d74b0 100644 --- a/engines/scumm/player_mod.cpp +++ b/engines/scumm/player_mod.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/player_mod.h" #include "sound/mixer.h" #include "sound/rate.h" diff --git a/engines/scumm/player_nes.cpp b/engines/scumm/player_nes.cpp index 5d3424da42..2a3cb438be 100644 --- a/engines/scumm/player_nes.cpp +++ b/engines/scumm/player_nes.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" #include "scumm/player_nes.h" #include "scumm/scumm.h" @@ -95,12 +95,12 @@ protected: byte wavehold; uint32 freq; // short uint32 CurD; - + public: byte Timer; int32 Pos; uint32 Cycles; // short - + inline byte GetTimer() const { return Timer; }; }; @@ -364,7 +364,7 @@ void Noise::Reset(void) { CurD = 1; Cycles = 1; EnvCtr = 1; - + } void Noise::Write(int Reg, byte Val) { @@ -450,7 +450,7 @@ protected: uint32 Cycles; int Num; } Frame; - + public: APU(int rate) : SampleRate(rate) { Reset(); @@ -499,7 +499,7 @@ byte APU::Read4015(void) { void APU::Reset (void) { BufPos = 0; - + _square0.Reset(); _square1.Reset(); _triangle.Reset(); @@ -533,10 +533,10 @@ int step(T &obj, int sampcycles, uint frame_Cycles, int frame_Num) { if (!frame_Cycles) { frame_Cycles = 7457; - + if (frame_Num < 4) { obj.QuarterFrame(); - + if (frame_Num & 1) frame_Cycles++; else @@ -546,19 +546,19 @@ int step(T &obj, int sampcycles, uint frame_Cycles, int frame_Num) { } else frame_Num = 0; } - + if (!obj.Cycles) obj.Run(); samppos += obj.Pos; } - + return samppos; } int16 APU::GetSample(void) { int samppos = 0; - + const int sampcycles = 1+(1789773-BufPos-1)/SampleRate; BufPos = BufPos + sampcycles * SampleRate - 1789773; @@ -581,7 +581,7 @@ int16 APU::GetSample(void) { } Frame.Cycles -= tmp; - + return (samppos << 6) / sampcycles; } diff --git a/engines/scumm/player_v1.cpp b/engines/scumm/player_v1.cpp index 8ae2772a6c..c2b82581b3 100644 --- a/engines/scumm/player_v1.cpp +++ b/engines/scumm/player_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" #include "scumm/player_v1.h" #include "scumm/scumm.h" diff --git a/engines/scumm/player_v2.cpp b/engines/scumm/player_v2.cpp index 82bb2cb4ec..01c077e4bc 100644 --- a/engines/scumm/player_v2.cpp +++ b/engines/scumm/player_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" #include "scumm/player_v2.h" #include "scumm/scumm.h" diff --git a/engines/scumm/player_v2a.cpp b/engines/scumm/player_v2a.cpp index ceabbc7d95..8316bc2dc4 100644 --- a/engines/scumm/player_v2a.cpp +++ b/engines/scumm/player_v2a.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" #include "scumm/player_v2a.h" #include "scumm/scumm.h" diff --git a/engines/scumm/player_v3a.cpp b/engines/scumm/player_v3a.cpp index 76913f351d..d53716cba3 100644 --- a/engines/scumm/player_v3a.cpp +++ b/engines/scumm/player_v3a.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" #include "scumm/player_v3a.h" #include "scumm/scumm.h" diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp index d96ecc58f6..4042ade9b4 100644 --- a/engines/scumm/resource.cpp +++ b/engines/scumm/resource.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/str.h" #include "scumm/charset.h" @@ -101,7 +101,7 @@ void ScummEngine::openRoom(const int room) { _fileOffset = _res->roomoffs[rtRoom][room]; return; } - + Common::String filename(generateFilename(room)); // Determine the encryption, if any. @@ -327,7 +327,7 @@ void ScummEngine::readIndexFile() { bool checkTryMedia(BaseScummFile *handle) { byte buf[TRYMEDIA_MARK_LEN]; bool matched = true; - const byte magic[2][TRYMEDIA_MARK_LEN] = + const byte magic[2][TRYMEDIA_MARK_LEN] = {{ 0x00, 'T', 'M', 'S', 'A', 'M' }, { 'i', '=', '$', ':', '(', '$' }}; // Same but 0x69 xored diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp index 816556775f..323aff849e 100644 --- a/engines/scumm/resource_v2.cpp +++ b/engines/scumm/resource_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/file.h" #include "scumm/scumm.h" diff --git a/engines/scumm/resource_v3.cpp b/engines/scumm/resource_v3.cpp index 5b3fc8e546..ddcba30232 100644 --- a/engines/scumm/resource_v3.cpp +++ b/engines/scumm/resource_v3.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/intern.h" #include "scumm/file.h" diff --git a/engines/scumm/resource_v4.cpp b/engines/scumm/resource_v4.cpp index 6a4e3f0c0a..0ced00e254 100644 --- a/engines/scumm/resource_v4.cpp +++ b/engines/scumm/resource_v4.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/intern.h" #include "scumm/file.h" diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp index bb0e0c88f8..dc3af6354d 100644 --- a/engines/scumm/room.cpp +++ b/engines/scumm/room.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/actor.h" #include "scumm/boxes.h" @@ -83,8 +83,8 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { if (_game.id == GID_SAMNMAX) { // WORKAROUND bug #85373 SAM: Overlapping music at Bigfoot convention // Added sound queue processing between execution of exit - // script and entry script. In the case of this bug, the - // entry script required that the iMuse state be fully up + // script and entry script. In the case of this bug, the + // entry script required that the iMuse state be fully up // to date, including last-moment changes from the previous // exit script. _sound->processSound(); @@ -423,8 +423,8 @@ void ScummEngine::setupRoomSubBlocks() { _HEV7ActorPalette[i] = i; } } - - + + // WORKAROUND bug #1074444: The dreaded DOTT "Can't get teeth" bug // makes it impossible to go on playing w/o cheating in some way. // It's not quite clear what causes it, but the effect is that object @@ -729,7 +729,7 @@ void ScummEngine_v3old::resetRoomSubBlocks() { numOfBoxes++; ptr += 5; } - + ptr = roomptr + *(roomptr + 0x15); size = numOfBoxes * SIZEOF_BOX_C64 + 1; diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index bc18af8426..2aa64ff409 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/savefile.h" @@ -59,10 +59,10 @@ struct SaveInfoSection { uint32 type; uint32 version; uint32 size; - + uint32 timeTValue; // Obsolete since version 2, but kept for compatibility uint32 playtime; - + uint32 date; uint16 time; }; @@ -152,7 +152,7 @@ bool ScummEngine::loadState(int slot, bool compat) { // we see a version that is higher than anything we'd expect... if (hdr.ver > 0xFFFFFF) hdr.ver = SWAP_BYTES_32(hdr.ver); - + // Reject save games which are too old or too new. Note that // We do not really support V7 games, but still accept them here // to work around a bug from the stone age (see below for more @@ -385,23 +385,23 @@ void ScummEngine::makeSavegameName(char *out, int slot, bool temporary) { void ScummEngine::listSavegames(bool *marks, int num) { assert(marks); - + char prefix[256]; char slot[2]; int slotNum; Common::StringList filenames; - + makeSavegameName(prefix, 99, false); prefix[strlen(prefix)-2] = '*'; prefix[strlen(prefix)-1] = 0; memset(marks, false, num * sizeof(bool)); //assume no savegames for this title filenames = _saveFileMan->listSavefiles(prefix); - + for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); file++){ //Obtain the last 2 digits of the filename, since they correspond to the save slot slot[0] = file->c_str()[file->size()-2]; slot[1] = file->c_str()[file->size()-1]; - + slotNum = atoi(slot); if (slotNum >= 0 && slotNum < num) marks[slotNum] = true; //mark this slot as valid @@ -509,8 +509,8 @@ bool ScummEngine::loadInfosFromSlot(int slot, InfoStuff *stuff) { delete in; return false; } - - delete in; + + delete in; return true; } @@ -540,11 +540,11 @@ bool ScummEngine::loadInfos(Common::InSaveFile *file, InfoStuff *stuff) { // For header version 1, we load the data in with our old method if (section.version == 1) { time_t tmp = section.timeTValue; - tm *curTime = localtime(&tmp); + tm *curTime = localtime(&tmp); stuff->date = (curTime->tm_mday & 0xFF) << 24 | ((curTime->tm_mon + 1) & 0xFF) << 16 | (curTime->tm_year + 1900) & 0xFFFF; stuff->time = (curTime->tm_hour & 0xFF) << 8 | (curTime->tm_min) & 0xFF; } - + if (section.version >= 2) { section.date = file->readUint32BE(); section.time = file->readUint16BE(); @@ -552,7 +552,7 @@ bool ScummEngine::loadInfos(Common::InSaveFile *file, InfoStuff *stuff) { stuff->date = section.date; stuff->time = section.time; } - + stuff->playtime = section.playtime; // Skip over the remaining (unsupported) data @@ -572,9 +572,9 @@ void ScummEngine::saveInfos(Common::OutSaveFile* file) { // still save old format for older versions section.timeTValue = time(0); section.playtime = _system->getMillis() / 1000 - _engineStartTime; - + time_t curTime_ = time(0); - tm *curTime = localtime(&curTime_); + tm *curTime = localtime(&curTime_); section.date = (curTime->tm_mday & 0xFF) << 24 | ((curTime->tm_mon + 1) & 0xFF) << 16 | (curTime->tm_year + 1900) & 0xFFFF; section.time = (curTime->tm_hour & 0xFF) << 8 | (curTime->tm_min) & 0xFF; diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index cc56adf622..9268768f2e 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/util.h" @@ -1141,7 +1141,7 @@ void ScummEngine::checkAndRunSentenceScript() { // // For now we assume that if there are more than 460 scripts, then // the pair 29/104 is used, else the pair 28/103. - + if (_res->num[rtScript] > 460) { if (sentenceScript == 104) sentenceScript = 29; diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp index 143e926604..127b453fc6 100644 --- a/engines/scumm/script_v0.cpp +++ b/engines/scumm/script_v0.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/actor.h" #include "scumm/charset.h" #include "scumm/intern.h" diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 532acc98a3..8f4f5e3d97 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/actor.h" #include "scumm/charset.h" #include "scumm/intern.h" diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index ab870f3f94..3baf1b4127 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/actor.h" #include "scumm/charset.h" #include "scumm/intern.h" @@ -591,7 +591,7 @@ void ScummEngine_v5::o5_animateActor() { // WORKAROUND bug #859513: While on mars, going outside without your helmet // (or missing some other part of your "space suite" will cause your - // character to complain ("I can't breathe."). Unfortunately, this is + // character to complain ("I can't breathe."). Unfortunately, this is // coupled with an animate command, making it very difficult to return to // safety (from where you came). The following hack works around this by // ignoring that particular turn command. @@ -951,9 +951,9 @@ void ScummEngine_v5::loadVars() { loadIQPoints(); } break; - } - - listSavegames(avail_saves, ARRAYSIZE(avail_saves)); + } + + listSavegames(avail_saves, ARRAYSIZE(avail_saves)); for (slot = a; slot <= b; ++slot) { slotSize = getResourceSize(rtString, slot); slotContent = getResourceAddress(rtString, slot); @@ -965,7 +965,7 @@ void ScummEngine_v5::loadVars() { char *ptr = name; // slotContent ends with {'\0','@'} -> max. length = slotSize-2 for (pos = 0; pos < slotSize - 2; ++pos) { - if (!ptr[pos]) + if (!ptr[pos]) break; // replace special characters if (ptr[pos] >= 32 && ptr[pos] <= 122 && ptr[pos] != 64) @@ -973,7 +973,7 @@ void ScummEngine_v5::loadVars() { else slotContent[pos] = '_'; } - slotContent[pos] = '\0'; + slotContent[pos] = '\0'; } else { slotContent[0] = '\0'; } @@ -1020,7 +1020,7 @@ void ScummEngine_v5::loadIQPoints() { byte *tmp = (byte*)malloc(size); int nread = file->read(tmp, size); if (nread == size) { - memcpy(ptr, tmp, size); + memcpy(ptr, tmp, size); } free(tmp); delete file; @@ -2855,7 +2855,7 @@ void ScummEngine_v5::decodeParseString() { break; case 15:{ // SO_TEXTSTRING const int len = resStrLen(_scriptPointer); - + if (_game.id == GID_LOOM && strcmp((const char *) _scriptPointer, "I am Choas.") == 0) { // WORKAROUND: This happens when Chaos introduces // herself to bishop Mandible. Of all the places to put diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index e436489f25..85ace39498 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" @@ -2238,12 +2238,12 @@ void ScummEngine_v6::o6_wait() { break; return; case 232: // SO_WAIT_FOR_TURN - // WORKAROUND for bug #744441: An angle will often be received as the + // WORKAROUND for bug #744441: An angle will often be received as the // actor number due to script bugs in The Dig. In all cases where this // occurs, _curActor is set just before it, so we can use it instead. // // For now, if the value passed in is divisible by 45, assume it is an - // angle, and use _curActor as the actor to wait for. + // angle, and use _curActor as the actor to wait for. offs = fetchScriptWordSigned(); actnum = pop(); if (actnum % 45 == 0) { diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp index 984604516d..0fdde28124 100644 --- a/engines/scumm/script_v8.cpp +++ b/engines/scumm/script_v8.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/system.h" diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 60911a97dd..7bcf3e243b 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/md5.h" @@ -121,7 +121,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) _gdi = new Gdi(this); } _res = new ResourceManager(this); - + // Convert MD5 checksum back into a digest for (int i = 0; i < 16; ++i) { char tmpStr[3] = "00"; @@ -131,9 +131,9 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) sscanf(tmpStr, "%x", &tmpVal); _gameMD5[i] = (byte)tmpVal; } - + _fileHandle = 0; - + // Init all vars _imuse = NULL; @@ -533,7 +533,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) _herculesBuf = (byte *)malloc(Common::kHercW * Common::kHercH); } - // Add debug levels + // Add debug levels for (int i = 0; i < ARRAYSIZE(debugChannels); ++i) Common::addSpecialDebugLevel(debugChannels[i].flag, debugChannels[i].channel, debugChannels[i].desc); } @@ -591,7 +591,7 @@ ScummEngine::~ScummEngine() { free(_fmtownsBuf); delete _debugger; - + delete _res; delete _gdi; } @@ -603,7 +603,7 @@ ScummEngine_v5::ScummEngine_v5(OSystem *syst, const DetectorResult &dr) // All "classic" games (V5 and older) encrypted their data files // with exception of the GF_OLD256 games and the PC-Engine version // of Loom. - if (!(_game.features & GF_OLD256) && _game.platform != Common::kPlatformPCEngine) + if (!(_game.features & GF_OLD256) && _game.platform != Common::kPlatformPCEngine) _game.features |= GF_USE_KEY; static const uint16 default_cursor_images[4][16] = { @@ -620,12 +620,12 @@ ScummEngine_v5::ScummEngine_v5(OSystem *syst, const DetectorResult &dr) { 0x1e00, 0x1200, 0x1200, 0x1200, 0x1200, 0x13ff, 0x1249, 0x1249, 0xf249, 0x9001, 0x9001, 0x9001, 0x8001, 0x8001, 0x8001, 0xffff }, }; - + static const byte default_cursor_hotspots[10] = { 8, 7, 8, 7, 1, 1, 5, 0, 8, 7, //zak256 }; - + for (int i = 0; i < 4; i++) { memcpy(_cursorImages[i], default_cursor_images[i], 32); @@ -829,7 +829,7 @@ ScummEngine_vCUPhe::ScummEngine_vCUPhe(OSystem *syst, const DetectorResult &dr) _game = dr.game; _filenamePattern = dr.fp, _quit = false; - + _cupPlayer = new CUP_Player(syst, this, _mixer); } @@ -856,7 +856,7 @@ int ScummEngine_vCUPhe::go() { void ScummEngine_vCUPhe::parseEvents() { Common::Event event; - + while (_eventMan->pollEvent(event)) { switch (event.type) { case Common::EVENT_QUIT: @@ -985,7 +985,7 @@ int ScummEngine::init() { assert(_game.id == GID_MANIAC); _fileHandle = new ScummNESFile(); _containerFile = _filenamePattern.pattern; - + _filenamePattern.pattern = "%.2d.LFL"; _filenamePattern.genMethod = kGenRoomNum; } else if (_game.platform == Common::kPlatformApple2GS) { @@ -994,7 +994,7 @@ int ScummEngine::init() { assert(_game.id == GID_MANIAC); tmpBuf1 = "maniac1.dsk"; tmpBuf2 = "maniac2.dsk"; - + _fileHandle = new ScummDiskImage(tmpBuf1, tmpBuf2, _game); _containerFile = tmpBuf1; @@ -1011,7 +1011,7 @@ int ScummEngine::init() { tmpBuf1 = "zak1.d64"; tmpBuf2 = "zak2.d64"; } - + _fileHandle = new ScummDiskImage(tmpBuf1, tmpBuf2, _game); _containerFile = tmpBuf1; @@ -1020,19 +1020,19 @@ int ScummEngine::init() { } else if (_game.platform == Common::kPlatformMacintosh) { // The mac versions of Indy4, Sam&Max, DOTT, FT and The Dig used a // special meta (container) file format to store the actual SCUMM data - // files. The rescumm utility used to be used to extract those files. - // While that is still possible, we now support reading those files + // files. The rescumm utility used to be used to extract those files. + // While that is still possible, we now support reading those files // directly. The first step is to check whether one of them is present - // (we do that here); the rest is handled by the ScummFile class and + // (we do that here); the rest is handled by the ScummFile class and // code in openResourceFile() (and in the Sound class, for MONSTER.SOU // handling). assert(_game.version >= 5 && _game.heversion == 0); _fileHandle = new ScummFile(); _containerFile = _filenamePattern.pattern; - - + + // We now have to determine the correct _filenamePattern. To do this - // we simply hardcode the possibilites. + // we simply hardcode the possibilites. const char *p1 = 0, *p2 = 0; switch (_game.id) { case GID_INDY4: @@ -1069,9 +1069,9 @@ int ScummEngine::init() { _game.features |= GF_DEMO; } else error("Couldn't find known subfile inside container file '%s'", _containerFile.c_str()); - + _fileHandle->close(); - + } else { error("kGenUnchanged used with unsupported platform"); } @@ -1079,7 +1079,7 @@ int ScummEngine::init() { // Regular access, no container file involved _fileHandle = new ScummFile(); } - + // Load CJK font, if present // Load it earlier so _useCJKMode variable could be set loadCJKFont(); @@ -1126,7 +1126,7 @@ void ScummEngine::setupScumm() { // On some systems it's not safe to run CD audio games from the CD. if (_game.features & GF_AUDIOTRACKS) { checkCD(); - + int cd_num = ConfMan.getInt("cdrom"); if (cd_num >= 0) _system->openCD(cd_num); @@ -1465,7 +1465,7 @@ void ScummEngine_v4::resetScumm() { ScummEngine::resetScumm(); // WORKAROUND for bug in boot script of Loom (CD) - // The boot script sets the characters of string 21, + // The boot script sets the characters of string 21, // before creating the string.resource. if (_game.id == GID_LOOM) { _res->createResource(rtString, 21, 12); @@ -1546,7 +1546,7 @@ void ScummEngine_v99he::resetScumm() { void ScummEngine::setupMusic(int midi) { int midiDriver = MidiDriver::detectMusicDriver(midi); _native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")); - + switch (midiDriver) { case MD_NULL: _musicType = MDT_NONE; @@ -1598,7 +1598,7 @@ void ScummEngine::setupMusic(int midi) { _musicType = MDT_ADLIB; } } - + // DOTT + SAM use General MIDI, so they shouldn't use GS settings if ((_game.id == GID_TENTACLE) || (_game.id == GID_SAMNMAX)) _enable_gs = false; @@ -1660,7 +1660,7 @@ void ScummEngine::setupMusic(int midi) { if (ConfMan.hasKey("tempo")) _imuse->property(IMuse::PROP_TEMPO_BASE, ConfMan.getInt("tempo")); // YM2162 driver can't handle midi->getPercussionChannel(), NULL shouldn't init MT-32/GM/GS - if ((midi != MDT_TOWNS) && (midi != MDT_NONE)) { + if ((midi != MDT_TOWNS) && (midi != MDT_NONE)) { _imuse->property(IMuse::PROP_NATIVE_MT32, _native_mt32); if (midiDriver != MD_MT32) // MT-32 Emulation shouldn't be GM/GS initialized _imuse->property(IMuse::PROP_GS, _enable_gs); @@ -1734,11 +1734,11 @@ int ScummEngine::go() { if (_debugger->isAttached()) _debugger->onFrame(); - + // Randomize the PRNG by calling it at regular intervals. This ensures // that it will be in a different state each time you run the program. _rnd.getRandomNumber(2); - + diff -= _system->getMillis(); waitForTimer(delta * 15 + diff); diff = _system->getMillis(); @@ -1813,7 +1813,7 @@ int ScummEngine::scummLoop(int delta) { CHARSET_1(); processInput(); - + scummLoop_updateScummVars(); if (_game.features & GF_AUDIOTRACKS) { @@ -1962,12 +1962,12 @@ int ScummEngine_v90he::scummLoop(int delta) { } int ret = ScummEngine::scummLoop(delta); - + _sprite->updateImages(); if (_game.heversion >= 98) { _logicHE->endOfFrame(); } - + return ret; } #endif @@ -2132,7 +2132,7 @@ void ScummEngine_v7::scummLoop_handleSound() { ScummEngine_v6::scummLoop_handleSound(); if (_imuseDigital) { _imuseDigital->flushTracks(); - // In CoMI and the full (non-demo) version of The Dig, also invoke IMuseDigital::refreshScripts + // In CoMI and the full (non-demo) version of The Dig, also invoke IMuseDigital::refreshScripts if ( ((_game.id == GID_DIG) && (!(_game.features & GF_DEMO))) || (_game.id == GID_CMI) ) _imuseDigital->refreshScripts(); } @@ -2257,7 +2257,7 @@ void ScummEngine::pauseEngineIntern(bool pause) { // Pause sound & video _oldSoundsPaused = _sound->_soundsPaused; _sound->pauseSounds(true); - + } else { // Update the screen to make it less likely that the player will see a // brief cursor palette glitch when the GUI is disabled. diff --git a/engines/scumm/smush/channel.cpp b/engines/scumm/smush/channel.cpp index 065712fcad..5b8cd3a853 100644 --- a/engines/scumm/smush/channel.cpp +++ b/engines/scumm/smush/channel.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/smush/channel.h" namespace Scumm { diff --git a/engines/scumm/smush/chunk.cpp b/engines/scumm/smush/chunk.cpp index ee24773c82..5e6f05b3e4 100644 --- a/engines/scumm/smush/chunk.cpp +++ b/engines/scumm/smush/chunk.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/smush/chunk.h" #include "scumm/scumm.h" #include "scumm/file.h" @@ -133,7 +133,7 @@ uint32 FileChunk::read(void *buffer, uint32 dataSize) { dataSize = _data->read(buffer, dataSize); _curPos += dataSize; - + return dataSize; } diff --git a/engines/scumm/smush/codec1.cpp b/engines/scumm/smush/codec1.cpp index a1f04b6a29..d0d92fcd79 100644 --- a/engines/scumm/smush/codec1.cpp +++ b/engines/scumm/smush/codec1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" namespace Scumm { diff --git a/engines/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp index 5207374313..22ba1b443d 100644 --- a/engines/scumm/smush/codec37.cpp +++ b/engines/scumm/smush/codec37.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" #include "scumm/bomp.h" diff --git a/engines/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp index 739c7308d3..0ad3815b1e 100644 --- a/engines/scumm/smush/codec47.cpp +++ b/engines/scumm/smush/codec47.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" #include "scumm/bomp.h" diff --git a/engines/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp index 951a4bdc7e..3a0efbc6b7 100644 --- a/engines/scumm/smush/imuse_channel.cpp +++ b/engines/scumm/smush/imuse_channel.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "scumm/scumm.h" // For DEBUG_SMUSH @@ -236,7 +236,7 @@ byte *ImuseChannel::getSoundData() { _sbuffer = 0; _sbufferSize = 0; - + return tmp; } diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp index 1bd74b2446..17296704ea 100644 --- a/engines/scumm/smush/saud_channel.cpp +++ b/engines/scumm/smush/saud_channel.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "scumm/util.h" @@ -168,7 +168,7 @@ byte *SaudChannel::getSoundData() { _sbuffer = 0; _sbufferSize = 0; - + return tmp; } diff --git a/engines/scumm/smush/smush_font.cpp b/engines/scumm/smush/smush_font.cpp index 094421cdcb..328fe694c1 100644 --- a/engines/scumm/smush/smush_font.cpp +++ b/engines/scumm/smush/smush_font.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/file.h" #include "scumm/scumm.h" #include "scumm/util.h" diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp index 04103bb8d8..0a0cda5b76 100644 --- a/engines/scumm/smush/smush_mixer.cpp +++ b/engines/scumm/smush/smush_mixer.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/util.h" #include "scumm/smush/smush_mixer.h" diff --git a/engines/scumm/smush/smush_mixer.h b/engines/scumm/smush/smush_mixer.h index 86adcd3bdc..0bf6de2762 100644 --- a/engines/scumm/smush/smush_mixer.h +++ b/engines/scumm/smush/smush_mixer.h @@ -26,7 +26,7 @@ #ifndef SCUMM_SMUSH_MIXER_H #define SCUMM_SMUSH_MIXER_H -#include "common/stdafx.h" + #include "scumm/sound.h" namespace Scumm { diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 612f2771db..7c66c8124d 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "engines/engine.h" diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 62f65c22c1..c33f1130fd 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/actor.h" #include "scumm/file.h" #include "scumm/imuse/imuse.h" @@ -200,7 +200,7 @@ void Sound::playSound(int soundID) { else if (READ_BE_UINT32(ptr) == 0x460e200d) { // This sound resource occurs in the Macintosh version of Monkey Island. // I do now know whether it is used in any place other than the one - // mentioned in the bug report above; in case it is, I put a check here. + // mentioned in the bug report above; in case it is, I put a check here. assert(soundID == 39); // The samplerate is copied from the sound resouce 39 of the PC CD/VGA @@ -927,7 +927,7 @@ BaseScummFile *Sound::openSfxFile() { Common::String basename[2]; Common::String tmp; - + const char *ptr = strchr(_vm->_filenamePattern.pattern, '.'); if (ptr) { basename[0] = Common::String(_vm->_filenamePattern.pattern, ptr - _vm->_filenamePattern.pattern + 1); diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index 83b4e90cf6..993c8e93e0 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" @@ -163,7 +163,7 @@ void ScummEngine_v6::drawBlastTexts() { do { c = *buf++; - + // FIXME: This is a workaround for bugs #864030 and #1399843: // In COMI, some text contains ASCII character 11 = 0xB. It's // not quite clear what it is good for; so for now we just ignore @@ -171,7 +171,7 @@ void ScummEngine_v6::drawBlastTexts() { // this is a 'vertical tab'). if (c == 0x0B) continue; - + // Some localizations may override colors // See credits in Chinese COMI if (c == '^' && (buf == _blastTextQueue[i].text + 1)) { @@ -568,7 +568,7 @@ void ScummEngine::CHARSET_1() { if (c == 13) { newLine:; _nextLeft = _string[0].xpos; -#ifndef DISABLE_SCUMM_7_8 +#ifndef DISABLE_SCUMM_7_8 if (_game.version >= 7 && subtitleLine != subtitleBuffer) { ((ScummEngine_v7 *)this)->addSubtitleToQueue(subtitleBuffer, subtitlePos, _charsetColor, _charset->getCurID()); subtitleLine = subtitleBuffer; @@ -1023,7 +1023,7 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize) *dst++ = 0xE1; continue; } - + // WORKAROUND for bug #1514457: Yet another script bug in Indy3. // Once more a german 'sz' was encoded incorrectly, but this time // they simply encoded it as 0xFF instead of 0xE1. Happens twice diff --git a/engines/scumm/thumbnail.cpp b/engines/scumm/thumbnail.cpp index 360d0de932..c928ed3421 100644 --- a/engines/scumm/thumbnail.cpp +++ b/engines/scumm/thumbnail.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "common/savefile.h" #include "graphics/scaler.h" diff --git a/engines/scumm/usage_bits.cpp b/engines/scumm/usage_bits.cpp index ebf9261afb..da262defc9 100644 --- a/engines/scumm/usage_bits.cpp +++ b/engines/scumm/usage_bits.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/usage_bits.h" diff --git a/engines/scumm/util.h b/engines/scumm/util.h index 0cf94eaff0..c05a90cfe6 100644 --- a/engines/scumm/util.h +++ b/engines/scumm/util.h @@ -26,7 +26,7 @@ #ifndef SCUMM_UTIL_H #define SCUMM_UTIL_H -#include "common/stdafx.h" + #include "common/scummsys.h" namespace Scumm { diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index 0dd4c83a0d..a00da335d2 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "scumm/scumm.h" #include "scumm/intern.h" diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp index fe9c9824de..98dba43f13 100644 --- a/engines/scumm/verbs.cpp +++ b/engines/scumm/verbs.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/actor.h" #include "scumm/charset.h" #include "scumm/intern.h" diff --git a/engines/sky/autoroute.cpp b/engines/sky/autoroute.cpp index 3086121942..f5740467bc 100644 --- a/engines/sky/autoroute.cpp +++ b/engines/sky/autoroute.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" diff --git a/engines/sky/autoroute.h b/engines/sky/autoroute.h index 0b9ad2912a..37818f378a 100644 --- a/engines/sky/autoroute.h +++ b/engines/sky/autoroute.h @@ -26,7 +26,7 @@ #ifndef SKY_AUTOROUTE_H #define SKY_AUTOROUTE_H -#include "common/stdafx.h" + #include "common/scummsys.h" namespace Sky { diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp index 2cdfbf679c..b3aba6ecab 100644 --- a/engines/sky/compact.cpp +++ b/engines/sky/compact.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" #include "common/file.h" @@ -34,8 +34,8 @@ extern int gDebugLevel; namespace Sky { -#define SKY_CPT_SIZE 419427 - +#define SKY_CPT_SIZE 419427 + #define OFFS(type,item) (((long)(&((type*)0)->item))) #define MK32(type,item) OFFS(type, item),0,0,0 #define MK16(type,item) OFFS(type, item),0 @@ -144,7 +144,7 @@ SkyCompact::SkyCompact(void) { dialog.runModal(); error("Incorrect sky.cpt size (%d, expected: %d)", _cptFile->size(), SKY_CPT_SIZE); } - + // set the necessary data structs up... _numDataLists = _cptFile->readUint16LE(); _cptNames = (char***)malloc(_numDataLists * sizeof(char**)); @@ -268,10 +268,10 @@ Compact *SkyCompact::fetchCpt(uint16 cptId) { if (cptId == 0xFFFF) // is this really still necessary? return NULL; assert(((cptId >> 12) < _numDataLists) && ((cptId & 0xFFF) < _dataListLen[cptId >> 12])); - + if (gDebugLevel >= 8) { debug(8, "Loading Compact %s [%s] (%04X=%d,%d)", _cptNames[cptId >> 12][cptId & 0xFFF], nameForType(_cptTypes[cptId >> 12][cptId & 0xFFF]), cptId, cptId >> 12, cptId & 0xFFF); - } + } return _compacts[cptId >> 12][cptId & 0xFFF]; } diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index c03cf9688b..ee8fee9ee8 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/config-manager.h" #include "common/file.h" @@ -245,7 +245,7 @@ void Control::removePanel(void) { delete _musicPanButton; delete _bodge; delete _yesNo; delete _text; delete _statusBar; delete _restoreButton; - + if (_textSprite) { free(_textSprite); _textSprite = NULL; diff --git a/engines/sky/control.h b/engines/sky/control.h index 217ab5714a..754f2100d2 100644 --- a/engines/sky/control.h +++ b/engines/sky/control.h @@ -26,7 +26,7 @@ #ifndef SKY_CONTROL_H #define SKY_CONTROL_H -#include "common/stdafx.h" + #include "common/events.h" #include "common/scummsys.h" diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp index 995a18c39b..1db7993227 100644 --- a/engines/sky/debug.cpp +++ b/engines/sky/debug.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" diff --git a/engines/sky/debug.h b/engines/sky/debug.h index 20b518768b..0e7ab8cfad 100644 --- a/engines/sky/debug.h +++ b/engines/sky/debug.h @@ -26,7 +26,7 @@ #ifndef SKY_DEBUG_H #define SKY_DEBUG_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "gui/debugger.h" diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp index 0cdb05aa00..cfcf6595ee 100644 --- a/engines/sky/disk.cpp +++ b/engines/sky/disk.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/file.h" #include "common/util.h" diff --git a/engines/sky/disk.h b/engines/sky/disk.h index b6a85569d4..5c63813248 100644 --- a/engines/sky/disk.h +++ b/engines/sky/disk.h @@ -26,7 +26,7 @@ #ifndef SKY_DISK_H #define SKY_DISK_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/str.h" #include "sky/rnc_deco.h" diff --git a/engines/sky/grid.h b/engines/sky/grid.h index 366a71518f..7f3bc48e54 100644 --- a/engines/sky/grid.h +++ b/engines/sky/grid.h @@ -26,7 +26,7 @@ #ifndef SKY_GRID_H #define SKY_GRID_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "skydefs.h" diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index 6d841495af..cde2f26f0b 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" #include "common/events.h" diff --git a/engines/sky/intro.h b/engines/sky/intro.h index 7f0b94fb52..4a54fb8dd3 100644 --- a/engines/sky/intro.h +++ b/engines/sky/intro.h @@ -26,7 +26,7 @@ #ifndef SKY_INTRO_H #define SKY_INTRO_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "sound/mixer.h" diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp index c5a6b32ea1..6e5c92bfa3 100644 --- a/engines/sky/logic.cpp +++ b/engines/sky/logic.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/rect.h" @@ -66,7 +66,7 @@ void Logic::setupLogicTable() { &Logic::waitSync, // 15 Set to l_script when sync!=0 &Logic::simpleAnim, // 16 Module anim without x,y's }; - + _logicTable = logicTable; } @@ -960,7 +960,7 @@ void Logic::setupMcodeTable() { &Logic::fnUnPauseFx, &Logic::fnPrintf }; - + _mcodeTable = mcodeTable; } diff --git a/engines/sky/logic.h b/engines/sky/logic.h index 8b42f89e5d..3d5ba36edf 100644 --- a/engines/sky/logic.h +++ b/engines/sky/logic.h @@ -26,7 +26,7 @@ #ifndef SKY_LOGIC_H #define SKY_LOGIC_H -#include "common/stdafx.h" + #include "common/util.h" namespace Sky { @@ -162,7 +162,7 @@ private: void setupMcodeTable(); const LogicTable *_logicTable; const McodeTable *_mcodeTable; - + protected: void push(uint32); uint32 pop(); diff --git a/engines/sky/mouse.cpp b/engines/sky/mouse.cpp index 524005b7e3..b3be8b4f36 100644 --- a/engines/sky/mouse.cpp +++ b/engines/sky/mouse.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/events.h" #include "common/system.h" #include "graphics/cursorman.h" diff --git a/engines/sky/mouse.h b/engines/sky/mouse.h index 83e82101bc..e131134699 100644 --- a/engines/sky/mouse.h +++ b/engines/sky/mouse.h @@ -26,7 +26,7 @@ #ifndef SKY_MOUSE_H #define SKY_MOUSE_H -#include "common/stdafx.h" + #include "common/scummsys.h" class OSystem; diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp index fa589d64c0..588057a7c8 100644 --- a/engines/sky/music/adlibchannel.cpp +++ b/engines/sky/music/adlibchannel.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" #include "sky/music/adlibchannel.h" @@ -158,7 +158,7 @@ uint8 AdlibChannel::process(uint16 aktTime) { case 8: com90_loopMusic(); break; case 9: com90_keyOff(); break; case 12: com90_setLoopPoint(); break; - + default: error("AdlibChannel: Unknown music opcode 0x%02X", opcode); break; diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index 03588f1fca..7c2b262d82 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "sky/music/adlibmusic.h" @@ -122,16 +122,16 @@ void AdlibMusic::setVolume(uint16 param) { _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, 2 * param); } -bool AdlibMusic::isStereo(void) const { - return false; +bool AdlibMusic::isStereo(void) const { + return false; } bool AdlibMusic::endOfData(void) const { - return false; + return false; } -int AdlibMusic::getRate(void) const { - return _sampleRate; +int AdlibMusic::getRate(void) const { + return _sampleRate; } } // End of namespace Sky diff --git a/engines/sky/music/musicbase.h b/engines/sky/music/musicbase.h index 40556e7e8a..ecb369c217 100644 --- a/engines/sky/music/musicbase.h +++ b/engines/sky/music/musicbase.h @@ -26,7 +26,7 @@ #ifndef SKY_MUSIC_MUSICBASE_H #define SKY_MUSIC_MUSICBASE_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "common/mutex.h" diff --git a/engines/sky/rnc_deco.cpp b/engines/sky/rnc_deco.cpp index c87968b521..eb8307764d 100644 --- a/engines/sky/rnc_deco.cpp +++ b/engines/sky/rnc_deco.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "sky/rnc_deco.h" diff --git a/engines/sky/rnc_deco.h b/engines/sky/rnc_deco.h index 89bdf83f45..38429383a3 100644 --- a/engines/sky/rnc_deco.h +++ b/engines/sky/rnc_deco.h @@ -26,7 +26,7 @@ #ifndef SKY_RNC_DECO_H #define SKY_RNC_DECO_H -#include "common/stdafx.h" + #define RNC_SIGNATURE 0x524E4301 // "RNC\001" diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp index cd99515d06..dab1724286 100644 --- a/engines/sky/screen.cpp +++ b/engines/sky/screen.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/events.h" #include "common/system.h" diff --git a/engines/sky/screen.h b/engines/sky/screen.h index f3fdda2506..cbe38fbe38 100644 --- a/engines/sky/screen.h +++ b/engines/sky/screen.h @@ -26,7 +26,7 @@ #ifndef SKY_SCREEN_H #define SKY_SCREEN_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "sky/skydefs.h" diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index 1ff23dbd07..11be2222ae 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "base/plugins.h" diff --git a/engines/sky/sky.h b/engines/sky/sky.h index 002964d6bb..b5d1701930 100644 --- a/engines/sky/sky.h +++ b/engines/sky/sky.h @@ -26,7 +26,7 @@ #ifndef SKY_H #define SKY_H -#include "common/stdafx.h" + #include "common/events.h" #include "engines/engine.h" diff --git a/engines/sky/skydefs.h b/engines/sky/skydefs.h index 49e717737c..f4be91b3d1 100644 --- a/engines/sky/skydefs.h +++ b/engines/sky/skydefs.h @@ -26,7 +26,7 @@ #ifndef SKY_DEFS_H #define SKY_DEFS_H -#include "common/stdafx.h" + namespace Sky { diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index c0dc227718..102d041643 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "sky/disk.h" @@ -1110,7 +1110,7 @@ void Sound::playSound(uint16 sound, uint16 volume, uint8 channel) { uint32 dataSize = READ_BE_UINT16(_sfxInfo + (sound << 3) + 2); uint32 dataLoop = READ_BE_UINT16(_sfxInfo + (sound << 3) + 6); dataOfs += _sfxBaseOfs; - + byte flags = Audio::Mixer::FLAG_UNSIGNED; uint32 loopSta = 0, loopEnd = 0; diff --git a/engines/sky/sound.h b/engines/sky/sound.h index c5f9011499..28e2e8c88a 100644 --- a/engines/sky/sound.h +++ b/engines/sky/sound.h @@ -26,7 +26,7 @@ #ifndef SKY_SOUND_H #define SKY_SOUND_H -#include "common/stdafx.h" + #include "common/scummsys.h" #include "sound/mixer.h" diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp index 3b7d2feb72..19080d8ff9 100644 --- a/engines/sky/text.cpp +++ b/engines/sky/text.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "sky/disk.h" diff --git a/engines/sky/text.h b/engines/sky/text.h index dd73b51db4..14c6936d38 100644 --- a/engines/sky/text.h +++ b/engines/sky/text.h @@ -26,7 +26,7 @@ #ifndef SKY_TEXT_H #define SKY_TEXT_H -#include "common/stdafx.h" + #include "common/scummsys.h" namespace Sky { @@ -61,7 +61,7 @@ public: void logicCursor(Compact *textCompact, uint16 mouseX, uint16 mouseY); void changeTextSpriteColour(uint8 *sprData, uint8 newCol); uint32 giveCurrentCharSet(void); - + uint32 _numLetters; //no of chars in message private: diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index d54968daeb..2bb027ddb4 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/file.h" #include "sword1/sword1.h" #include "sword1/animation.h" diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index c5b968aabe..388cb132da 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/file.h" #include "common/util.h" #include "common/savefile.h" diff --git a/engines/sword1/credits.cpp b/engines/sword1/credits.cpp index 0dd190232a..14dd0ecd2b 100644 --- a/engines/sword1/credits.cpp +++ b/engines/sword1/credits.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "sword1/credits.h" diff --git a/engines/sword1/debug.cpp b/engines/sword1/debug.cpp index 9eddc60942..ca74ea63b2 100644 --- a/engines/sword1/debug.cpp +++ b/engines/sword1/debug.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/util.h" #include "sword1/debug.h" diff --git a/engines/sword1/eventman.cpp b/engines/sword1/eventman.cpp index 74c8b30f9a..3d36880700 100644 --- a/engines/sword1/eventman.cpp +++ b/engines/sword1/eventman.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "sword1/eventman.h" #include "sword1/sworddefs.h" #include "common/util.h" diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp index 60103ba5f9..c761628128 100644 --- a/engines/sword1/logic.cpp +++ b/engines/sword1/logic.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" @@ -67,7 +67,7 @@ Logic::Logic(ObjectMan *pObjMan, ResMan *resMan, Screen *pScreen, Mouse *pMouse, _eventMan = NULL; _system = system; _mixer = mixer; - + setupMcodeTable(); } @@ -789,7 +789,7 @@ void Logic::setupMcodeTable() { &Logic::fnPurple, &Logic::fnBlack }; - + _mcodeTable = mcodeTable; } diff --git a/engines/sword1/memman.cpp b/engines/sword1/memman.cpp index 558140b73b..4d7f2abe53 100644 --- a/engines/sword1/memman.cpp +++ b/engines/sword1/memman.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "sword1/memman.h" #include "common/util.h" diff --git a/engines/sword1/menu.cpp b/engines/sword1/menu.cpp index 0ffeb2b1a0..4c21b77411 100644 --- a/engines/sword1/menu.cpp +++ b/engines/sword1/menu.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "sword1/menu.h" #include "sword1/resman.h" #include "common/scummsys.h" diff --git a/engines/sword1/mouse.cpp b/engines/sword1/mouse.cpp index cc4bd5e028..6e9888a5bb 100644 --- a/engines/sword1/mouse.cpp +++ b/engines/sword1/mouse.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "graphics/cursorman.h" diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index e6acd8f3cd..2b8f622dc0 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/file.h" #include "common/util.h" @@ -108,12 +108,12 @@ int BaseAudioStream::readBuffer(int16 *buffer, const int numSamples) { *buffer++ = (int16)*src++ << 8; } } - + if (!_samplesLeft && _loop) { rewind(); } } - + return retVal; } @@ -173,7 +173,7 @@ AiffAudioStream::AiffAudioStream(Common::SeekableReadStream *source, bool loop) void AiffAudioStream::rewind() { int rate, size; byte flags; - + _sourceStream->seek(0); if (Audio::loadAIFFFromStream(*_sourceStream, size, rate, flags)) { @@ -189,7 +189,7 @@ int AiffAudioStream::readBuffer(int16 *buffer, const int numSamples) { buffer[i] = (int16)READ_BE_UINT16(buffer + i); } } - + return retVal; } @@ -244,7 +244,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { if (_file.open(fileName)) _audioSource = new AiffAudioStream(&_file, loop); } - + if (!_audioSource) return false; diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp index 0d3a79b1d2..d54b85dc66 100644 --- a/engines/sword1/objectman.cpp +++ b/engines/sword1/objectman.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/util.h" #include "sword1/objectman.h" diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp index 0ed9b833f1..5f1c23d482 100644 --- a/engines/sword1/resman.cpp +++ b/engines/sword1/resman.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/util.h" #include "common/str.h" @@ -421,7 +421,7 @@ void ResMan::openScriptResourceBigEndian(uint32 id) { needByteSwap = (memHandle->cond == MEM_FREED); } resOpen(id); - if (needByteSwap) { + if (needByteSwap) { MemHandle *handle = resHandle(id); // uint32 totSize = handle->size; Header *head = (Header*)handle->data; @@ -450,7 +450,7 @@ void ResMan::openScriptResourceLittleEndian(uint32 id) { needByteSwap = (memHandle->cond == MEM_FREED); } resOpen(id); - if (needByteSwap) { + if (needByteSwap) { MemHandle *handle = resHandle(id); // uint32 totSize = handle->size; Header *head = (Header*)handle->data; diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp index 6478674eb2..f6d5e714fc 100644 --- a/engines/sword1/router.cpp +++ b/engines/sword1/router.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/util.h" #include "sword1/router.h" diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp index 078f14a00e..63e2adaa53 100644 --- a/engines/sword1/screen.cpp +++ b/engines/sword1/screen.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "common/util.h" @@ -139,7 +139,7 @@ void Screen::fnSetPalette(uint8 start, uint16 length, uint32 id, bool fadeUp) { uint8 *palData = (uint8*)_resMan->openFetchRes(id); if (start == 0) // force color 0 to black palData[0] = palData[1] = palData[2] = 0; - + if (SwordEngine::_systemVars.isMac) { // see bug #1701058 if (start != 0 && start + length == 256) // and force color 255 to black as well palData[(length-1)*3+0] = palData[(length-1)*3+1] = palData[(length-1)*3+2] = 0; diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index 2594aaf8f4..44394ee1d9 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" diff --git a/engines/sword1/staticres.cpp b/engines/sword1/staticres.cpp index 63a1ce35ef..c4fee3b1b1 100644 --- a/engines/sword1/staticres.cpp +++ b/engines/sword1/staticres.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "sword1/sworddefs.h" #include "sword1/swordres.h" #include "sword1/screen.h" diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index b5152f33bc..625f484ed5 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "sword1/sword1.h" #include "base/plugins.h" @@ -128,7 +128,7 @@ GameList Engine_SWORD1_detectGames(const FSList &fslist) { bool filesFound[NUM_FILES_TO_CHECK]; for (i = 0; i < NUM_FILES_TO_CHECK; i++) filesFound[i] = false; - + Sword1CheckDirectory(fslist, filesFound); bool mainFilesFound = true; bool pcFilesFound = true; @@ -181,7 +181,7 @@ SwordEngine::SwordEngine(OSystem *syst) if (!scumm_stricmp(ConfMan.get("gameid").c_str(), "sword1demo")) _features = GF_DEMO; else - _features = 0; + _features = 0; if (!_mixer->isReady()) warning("Sound initialization failed"); @@ -215,12 +215,12 @@ int SwordEngine::init() { initCommonGFX(true); _system->initSize(640, 480); _system->endGFXTransaction(); - + if ( 0 == scumm_stricmp(ConfMan.get("gameid").c_str(), "sword1mac") || 0 == scumm_stricmp(ConfMan.get("gameid").c_str(), "sword1macdemo") ) _systemVars.isMac = true; else - _systemVars.isMac = false; + _systemVars.isMac = false; checkCdFiles(); diff --git a/engines/sword1/text.cpp b/engines/sword1/text.cpp index adab06e283..83ed38c530 100644 --- a/engines/sword1/text.cpp +++ b/engines/sword1/text.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 12998e5e6d..082d02a88f 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/file.h" #include "common/events.h" diff --git a/engines/sword2/anims.cpp b/engines/sword2/anims.cpp index 1878b1d6f1..1bf3967047 100644 --- a/engines/sword2/anims.cpp +++ b/engines/sword2/anims.cpp @@ -31,7 +31,7 @@ // DON'T TOUCH! // --------------------------------------------------------------------------- -#include "common/stdafx.h" + #include "common/file.h" #include "sword2/sword2.h" diff --git a/engines/sword2/console.cpp b/engines/sword2/console.cpp index 1fae963ee8..3d2b89df55 100644 --- a/engines/sword2/console.cpp +++ b/engines/sword2/console.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/rect.h" #include "common/system.h" diff --git a/engines/sword2/controls.cpp b/engines/sword2/controls.cpp index 84580c7520..6b466d6be0 100644 --- a/engines/sword2/controls.cpp +++ b/engines/sword2/controls.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/events.h" #include "common/rect.h" #include "common/config-manager.h" diff --git a/engines/sword2/debug.cpp b/engines/sword2/debug.cpp index f1f93c4731..e6662a4ef7 100644 --- a/engines/sword2/debug.cpp +++ b/engines/sword2/debug.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/rect.h" #include "sword2/sword2.h" diff --git a/engines/sword2/events.cpp b/engines/sword2/events.cpp index 4a2838795c..f0e0e567a4 100644 --- a/engines/sword2/events.cpp +++ b/engines/sword2/events.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp index 188ddd4d9b..917d47d7a2 100644 --- a/engines/sword2/function.cpp +++ b/engines/sword2/function.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/system.h" #include "common/file.h" diff --git a/engines/sword2/icons.cpp b/engines/sword2/icons.cpp index 13f211d7a0..5ecad3b8f7 100644 --- a/engines/sword2/icons.cpp +++ b/engines/sword2/icons.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/stream.h" #include "common/rect.h" diff --git a/engines/sword2/interpreter.cpp b/engines/sword2/interpreter.cpp index 605f1625fa..d3f202211d 100644 --- a/engines/sword2/interpreter.cpp +++ b/engines/sword2/interpreter.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/util.h" #include "sword2/sword2.h" diff --git a/engines/sword2/layers.cpp b/engines/sword2/layers.cpp index 2b5f215b7a..34ee395f16 100644 --- a/engines/sword2/layers.cpp +++ b/engines/sword2/layers.cpp @@ -33,7 +33,7 @@ // 3 normal sorted layers // up to 2 foreground parallax layers -#include "common/stdafx.h" + #include "common/rect.h" #include "sword2/sword2.h" diff --git a/engines/sword2/logic.cpp b/engines/sword2/logic.cpp index 03a248450a..9ff7e6b45f 100644 --- a/engines/sword2/logic.cpp +++ b/engines/sword2/logic.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "sword2/sword2.h" #include "sword2/defs.h" @@ -47,7 +47,7 @@ Logic::Logic(Sword2Engine *vm) : memset(_eventList, 0, sizeof(_eventList)); memset(_syncList, 0, sizeof(_syncList)); _router = new Router(_vm); - + setupOpcodes(); } diff --git a/engines/sword2/maketext.cpp b/engines/sword2/maketext.cpp index 324f7c19ca..65a98b8f32 100644 --- a/engines/sword2/maketext.cpp +++ b/engines/sword2/maketext.cpp @@ -43,7 +43,7 @@ // for new system by JEL on 9oct96 and updated again (for font // as a resource) on 5dec96. -#include "common/stdafx.h" + #include "common/system.h" #include "sword2/sword2.h" diff --git a/engines/sword2/memory.cpp b/engines/sword2/memory.cpp index c3d0a7add6..5ca484343c 100644 --- a/engines/sword2/memory.cpp +++ b/engines/sword2/memory.cpp @@ -48,7 +48,7 @@ // // The number zero is used to represent the NULL pointer. -#include "common/stdafx.h" + #include "sword2/sword2.h" #include "sword2/memory.h" diff --git a/engines/sword2/menu.cpp b/engines/sword2/menu.cpp index 2f93227bfa..41a2e34c8b 100644 --- a/engines/sword2/menu.cpp +++ b/engines/sword2/menu.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/rect.h" #include "sword2/sword2.h" diff --git a/engines/sword2/mouse.cpp b/engines/sword2/mouse.cpp index 46cc5372a1..b6d435c45b 100644 --- a/engines/sword2/mouse.cpp +++ b/engines/sword2/mouse.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/system.h" #include "common/events.h" diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index c2374dad9f..54a6474cd0 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -31,7 +31,7 @@ // // All things considered, I think this is more bother than it's worth. -#include "common/stdafx.h" + #include "common/file.h" #include "common/system.h" @@ -139,7 +139,7 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, } fh->file.seek(pos, SEEK_SET); - + Common::MemoryReadStream *tmp = 0; switch (fh->fileType) { diff --git a/engines/sword2/palette.cpp b/engines/sword2/palette.cpp index dcc519cdce..127340ea89 100644 --- a/engines/sword2/palette.cpp +++ b/engines/sword2/palette.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/system.h" #include "sword2/sword2.h" diff --git a/engines/sword2/protocol.cpp b/engines/sword2/protocol.cpp index e4992c27c7..65b236e2db 100644 --- a/engines/sword2/protocol.cpp +++ b/engines/sword2/protocol.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "sword2/sword2.h" #include "sword2/header.h" diff --git a/engines/sword2/render.cpp b/engines/sword2/render.cpp index dafef6de00..f5464efd4b 100644 --- a/engines/sword2/render.cpp +++ b/engines/sword2/render.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/system.h" diff --git a/engines/sword2/resman.cpp b/engines/sword2/resman.cpp index e8c5fcf42a..46637dd4ef 100644 --- a/engines/sword2/resman.cpp +++ b/engines/sword2/resman.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/file.h" #include "common/system.h" @@ -89,7 +89,7 @@ ResourceManager::~ResourceManager() { free(_resConvTable); } - + bool ResourceManager::init() { uint32 i, j; diff --git a/engines/sword2/router.cpp b/engines/sword2/router.cpp index b05f2ae0e5..6be155dd85 100644 --- a/engines/sword2/router.cpp +++ b/engines/sword2/router.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/stream.h" #include "sword2/sword2.h" diff --git a/engines/sword2/saveload.cpp b/engines/sword2/saveload.cpp index 9d6826f1a0..c08ef99996 100644 --- a/engines/sword2/saveload.cpp +++ b/engines/sword2/saveload.cpp @@ -34,7 +34,7 @@ // // --------------------------------------------------------------------------- -#include "common/stdafx.h" + #include "common/savefile.h" #include "sword2/sword2.h" diff --git a/engines/sword2/screen.cpp b/engines/sword2/screen.cpp index 0a1b45d2de..d4d286c018 100644 --- a/engines/sword2/screen.cpp +++ b/engines/sword2/screen.cpp @@ -29,7 +29,7 @@ // BUILD_DISPLAY.CPP like the old spr_engi but slightly more aptly named // --------------------------------------------------------------------------- -#include "common/stdafx.h" + #include "common/system.h" #include "common/events.h" diff --git a/engines/sword2/scroll.cpp b/engines/sword2/scroll.cpp index 7df70c8019..eb080eb4b3 100644 --- a/engines/sword2/scroll.cpp +++ b/engines/sword2/scroll.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp index 04b3e55098..6af94c9cb6 100644 --- a/engines/sword2/sound.cpp +++ b/engines/sword2/sound.cpp @@ -35,7 +35,7 @@ // // --------------------------------------------------------------------------- -#include "common/stdafx.h" + #include "common/file.h" #include "common/system.h" diff --git a/engines/sword2/speech.cpp b/engines/sword2/speech.cpp index 0e8aa70538..b6f77dde74 100644 --- a/engines/sword2/speech.cpp +++ b/engines/sword2/speech.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/file.h" #include "sword2/sword2.h" diff --git a/engines/sword2/sprite.cpp b/engines/sword2/sprite.cpp index 9aa3bfff9b..e6f17a1af1 100644 --- a/engines/sword2/sprite.cpp +++ b/engines/sword2/sprite.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/startup.cpp b/engines/sword2/startup.cpp index 870a13fd46..1841384897 100644 --- a/engines/sword2/startup.cpp +++ b/engines/sword2/startup.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/file.h" #include "sword2/sword2.h" diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index 6bbd58ff3c..372fc79214 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "base/plugins.h" @@ -112,7 +112,7 @@ GameList Engine_SWORD2_detectGames(const FSList &fslist) { } } - + if (detectedGames.empty()) { // Nothing found -- try to recurse into the 'clusters' subdirectory, // present e.g. if the user copied the data straight from CD. @@ -179,7 +179,7 @@ Sword2Engine::Sword2Engine(OSystem *syst) : Engine(syst) { _features = GF_DEMO; else _features = 0; - + _bootParam = ConfMan.getInt("boot_param"); _saveSlot = ConfMan.getInt("save_slot"); diff --git a/engines/sword2/sync.cpp b/engines/sword2/sync.cpp index 57e857b6ed..1adc652b75 100644 --- a/engines/sword2/sync.cpp +++ b/engines/sword2/sync.cpp @@ -25,7 +25,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/walker.cpp b/engines/sword2/walker.cpp index 4db69474d9..7971299818 100644 --- a/engines/sword2/walker.cpp +++ b/engines/sword2/walker.cpp @@ -29,7 +29,7 @@ // Functions for moving megas about the place & also for keeping tabs on them -#include "common/stdafx.h" + #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 8e8de71e9c..af5a9f7908 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/config-manager.h" #include "common/advancedDetector.h" diff --git a/engines/touche/graphics.cpp b/engines/touche/graphics.cpp index 2ca11a1f95..0298028e6a 100644 --- a/engines/touche/graphics.cpp +++ b/engines/touche/graphics.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "touche/graphics.h" diff --git a/engines/touche/midi.cpp b/engines/touche/midi.cpp index b90d4082c5..14cb85912a 100644 --- a/engines/touche/midi.cpp +++ b/engines/touche/midi.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/stream.h" #include "sound/midiparser.h" diff --git a/engines/touche/opcodes.cpp b/engines/touche/opcodes.cpp index 2680ab0fae..4405c614ac 100644 --- a/engines/touche/opcodes.cpp +++ b/engines/touche/opcodes.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "touche/touche.h" diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp index cd2124806d..0dcf7505d7 100644 --- a/engines/touche/resource.cpp +++ b/engines/touche/resource.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "sound/flac.h" #include "sound/mixer.h" diff --git a/engines/touche/saveload.cpp b/engines/touche/saveload.cpp index 5ff749fa68..7901e5c31f 100644 --- a/engines/touche/saveload.cpp +++ b/engines/touche/saveload.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/savefile.h" #include "touche/graphics.h" diff --git a/engines/touche/staticres.cpp b/engines/touche/staticres.cpp index eb3ddc15ff..29c22ce6a8 100644 --- a/engines/touche/staticres.cpp +++ b/engines/touche/staticres.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "touche/graphics.h" #include "touche/touche.h" diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp index c276cebbe8..27ab830ef7 100644 --- a/engines/touche/touche.cpp +++ b/engines/touche/touche.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/config-manager.h" #include "common/events.h" #include "common/system.h" diff --git a/engines/touche/ui.cpp b/engines/touche/ui.cpp index 62fcf9d4ee..06e64ba1b0 100644 --- a/engines/touche/ui.cpp +++ b/engines/touche/ui.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/events.h" #include "common/system.h" #include "common/savefile.h" @@ -371,32 +371,32 @@ void ToucheEngine::handleOptions(int forceDisplay) { curMode = menuData.mode; if (menuData.mode == kMenuLoadStateMode || menuData.mode == kMenuSaveStateMode) { assert(menuData.saveLoadMarks); - + char gameStateFileName[16]; generateGameStateFileName(999, gameStateFileName, 15, true); char slot[2]; int slotNum; Common::StringList filenames; - - memset(menuData.saveLoadMarks, false, 100 * sizeof(bool)); //assume no savegames for this title + + memset(menuData.saveLoadMarks, false, 100 * sizeof(bool)); //assume no savegames for this title filenames = _saveFileMan->listSavefiles(gameStateFileName); - + for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); file++){ //Obtain the last 1 or 2 digits of the filename, since they correspond to the save slot //This engine can save games either with one or two digits, hence the additional if statement slot[0] = file->c_str()[file->size()-2]; slot[1] = file->c_str()[file->size()-1]; - + if (!atoi(&slot[0])){ slotNum = atoi(&slot[1]); } else { slotNum = atoi(slot); } - + if (slotNum >= 0 && slotNum < 100) menuData.saveLoadMarks[slotNum] = true; //mark this slot as valid } - + for (int i = 0; i < 100; ++i) { menuData.saveLoadDescriptionsTable[i][0] = 0; if (menuData.saveLoadMarks[i]) { |