diff options
Diffstat (limited to 'backends')
117 files changed, 70 insertions, 190 deletions
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 6bd97c7f71..7730cb7df1 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -25,7 +25,6 @@ #if !defined(DISABLE_DEFAULT_EVENTMANAGER) -#include "common/stdafx.h" #include "common/config-manager.h" #include "common/system.h" #include "backends/events/default/default-events.h" @@ -48,9 +47,9 @@ DefaultEventManager::DefaultEventManager(OSystem *boss) : bool DefaultEventManager::pollEvent(Common::Event &event) { uint32 time = _boss->getMillis(); bool result; - + result = _boss->pollEvent(event); - + if (result) { event.synthetic = false; switch (event.type) { @@ -124,7 +123,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { result = true; } } - + return result; } diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h index 6e8ce6b77c..e7d70cb152 100644 --- a/backends/events/default/default-events.h +++ b/backends/events/default/default-events.h @@ -26,7 +26,6 @@ #if !defined(BACKEND_EVENTS_DEFAULT_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER) #define BACKEND_EVENTS_DEFAULT_H -#include "common/stdafx.h" #include "common/events.h" /* diff --git a/backends/fs/abstract-fs-factory.h b/backends/fs/abstract-fs-factory.h index 79ec3f7520..c4ce277505 100644 --- a/backends/fs/abstract-fs-factory.h +++ b/backends/fs/abstract-fs-factory.h @@ -25,7 +25,6 @@ #ifndef ABSTRACT_FILESYSTEM_FACTORY_H #define ABSTRACT_FILESYSTEM_FACTORY_H -#include "common/stdafx.h" #include "common/str.h" #include "backends/fs/abstract-fs.h" @@ -35,12 +34,12 @@ class AbstractFilesystemFactory { public: typedef Common::String String; - + /** * Destructor. */ virtual ~AbstractFilesystemFactory() {} - + /** * Returns a node representing the "current directory". * If your system does not support this concept, you can either try to @@ -48,7 +47,7 @@ public: * e.g. the same value as getRoot() returns. */ virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const = 0; - + /** * Construct a node based on a path; the path is in the same format as it * would be for calls to fopen(). @@ -60,17 +59,17 @@ public: * @param path The path string to create a FilesystemNode for. */ virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const = 0; - + /** * Returns a special node representing the filesystem root. * The starting point for any file system browsing. - * + * * On Unix, this will be simply the node for / (the root directory). * On Windows, it will be a special node which "contains" all drives (C:, D:, E:). */ virtual AbstractFilesystemNode *makeRootFileNode() const = 0; - - + + /** * Meta-factory method which returns a concrete AbstractFilesystemFactory * instance depending on the current architecture. diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index 3eefd6507e..4ad02e0655 100644 --- a/backends/fs/amigaos4/amigaos4-fs.cpp +++ b/backends/fs/amigaos4/amigaos4-fs.cpp @@ -35,8 +35,6 @@ #include <strings.h> #endif -#include <common/stdafx.h> - #include "common/util.h" #include "engines/engine.h" #include "backends/fs/abstract-fs.h" diff --git a/backends/fs/dc/dc-fs.cpp b/backends/fs/dc/dc-fs.cpp index 0b204dc309..a814d05cec 100644 --- a/backends/fs/dc/dc-fs.cpp +++ b/backends/fs/dc/dc-fs.cpp @@ -24,7 +24,6 @@ #if defined(__DC__) -#include "common/stdafx.h" #include "backends/fs/abstract-fs.h" #include <ronin/cdfs.h> diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp index 11d373ea1e..891f0df636 100644 --- a/backends/fs/ds/ds-fs.cpp +++ b/backends/fs/ds/ds-fs.cpp @@ -20,7 +20,6 @@ * */ -#include "stdafx.h" #include "str.h" #include "common/util.h" //#include <NDS/ARM9/console.h> //basic print funcionality diff --git a/backends/fs/gp32/gp32-fs.cpp b/backends/fs/gp32/gp32-fs.cpp index 1585bd22f1..4fb88467ea 100644 --- a/backends/fs/gp32/gp32-fs.cpp +++ b/backends/fs/gp32/gp32-fs.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "backends/fs/abstract-fs.h" #define MAX_PATH_SIZE 256 diff --git a/backends/fs/morphos/abox-fs.cpp b/backends/fs/morphos/abox-fs.cpp index ef50a11e4e..05c13662bc 100644 --- a/backends/fs/morphos/abox-fs.cpp +++ b/backends/fs/morphos/abox-fs.cpp @@ -29,8 +29,6 @@ #include <stdio.h> #include <sys/stat.h> -#include <common/stdafx.h> - #include "common/util.h" #include "base/engine.h" #include "backends/fs/abstract-fs.h" diff --git a/backends/fs/palmos/palmos-fs.cpp b/backends/fs/palmos/palmos-fs.cpp index d44958254d..cda3ee3c33 100644 --- a/backends/fs/palmos/palmos-fs.cpp +++ b/backends/fs/palmos/palmos-fs.cpp @@ -27,7 +27,6 @@ #include "PalmVersion.h" #include "globals.h" -#include "common/stdafx.h" #include "backends/fs/abstract-fs.h" /** diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 5871d1ef42..1f66d5639d 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -24,7 +24,6 @@ #if defined(UNIX) -#include "common/stdafx.h" #include "backends/fs/abstract-fs.h" #ifdef MACOSX diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp index e8a9553927..0d7b37ee4d 100644 --- a/backends/fs/symbian/symbian-fs.cpp +++ b/backends/fs/symbian/symbian-fs.cpp @@ -23,7 +23,6 @@ */ #if defined (__SYMBIAN32__) -#include "common/stdafx.h" #include "backends/fs/abstract-fs.h" #include <dirent.h> diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp index c7f500f108..b2c3bc64fb 100644 --- a/backends/fs/windows/windows-fs.cpp +++ b/backends/fs/windows/windows-fs.cpp @@ -27,7 +27,6 @@ #ifdef _WIN32_WCE #include <windows.h> #endif -#include "common/stdafx.h" #include "backends/fs/abstract-fs.h" #include <io.h> #include <stdio.h> @@ -54,7 +53,7 @@ /** * Implementation of the ScummVM file system API based on Windows API. - * + * * Parts of this class are documented in the base interface class, AbstractFilesystemNode. */ class WindowsFilesystemNode : public AbstractFilesystemNode { @@ -68,25 +67,25 @@ protected: public: /** * Creates a WindowsFilesystemNode with the root node as path. - * + * * In regular windows systems, a virtual root path is used "". * In windows CE, the "\" root is used instead. */ WindowsFilesystemNode(); - + /** * Creates a WindowsFilesystemNode for a given path. - * + * * Examples: * path=c:\foo\bar.txt, currentDir=false -> c:\foo\bar.txt * path=c:\foo\bar.txt, currentDir=true -> current directory * path=NULL, currentDir=true -> current directory - * + * * @param path String with the path the new node should point to. * @param currentDir if true, the path parameter will be ignored and the resulting node will point to the current directory. */ WindowsFilesystemNode(const String &path, const bool currentDir); - + virtual bool exists() const { return _access(_path.c_str(), F_OK) == 0; } virtual String getDisplayName() const { return _displayName; } virtual String getName() const { return _displayName; } @@ -103,26 +102,26 @@ public: private: /** * Adds a single WindowsFilesystemNode to a given list. - * This method is used by getChildren() to populate the directory entries list. - * + * This method is used by getChildren() to populate the directory entries list. + * * @param list List to put the file entry node in. * @param mode Mode to use while adding the file entry to the list. * @param base String with the directory being listed. * @param find_data Describes a file that the FindFirstFile, FindFirstFileEx, or FindNextFile functions find. */ static void addFile(AbstractFSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data); - + /** * Converts a Unicode string to Ascii format. - * + * * @param str String to convert from Unicode to Ascii. * @return str in Ascii format. */ static char *toAscii(TCHAR *str); - + /** * Converts an Ascii string to Unicode format. - * + * * @param str String to convert from Ascii to Unicode. * @return str in Unicode format. */ @@ -131,11 +130,11 @@ private: /** * Returns the last component of a given path. - * + * * Examples: * c:\foo\bar.txt would return "\bar.txt" * c:\foo\bar\ would return "\bar\" - * + * * @param str Path to obtain the last component from. * @return Pointer to the first char of the last component inside str. */ @@ -229,7 +228,7 @@ WindowsFilesystemNode::WindowsFilesystemNode(const String &p, const bool current assert(p.size() > 0); _path = p; } - + _displayName = lastPathComponent(_path); // Check whether it is a directory, and whether the file actually exists @@ -247,7 +246,7 @@ WindowsFilesystemNode::WindowsFilesystemNode(const String &p, const bool current AbstractFilesystemNode *WindowsFilesystemNode::getChild(const String &n) const { assert(_isDirectory); - + String newPath(_path); if (_path.lastChar() != '\\') newPath += '\\'; @@ -297,12 +296,12 @@ bool WindowsFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b sprintf(searchPath, "%s*", _path.c_str()); handle = FindFirstFile(toUnicode(searchPath), &desc); - + if (handle == INVALID_HANDLE_VALUE) return false; - + addFile(myList, mode, _path.c_str(), &desc); - + while (FindNextFile(handle, &desc)) addFile(myList, mode, _path.c_str(), &desc); @@ -314,10 +313,10 @@ bool WindowsFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b AbstractFilesystemNode *WindowsFilesystemNode::getParent() const { assert(_isValid || _isPseudoRoot); - + if (_isPseudoRoot) return 0; - + WindowsFilesystemNode *p = new WindowsFilesystemNode(); if (_path.size() > 3) { const char *start = _path.c_str(); @@ -330,7 +329,7 @@ AbstractFilesystemNode *WindowsFilesystemNode::getParent() const { p->_displayName = lastPathComponent(p->_path); p->_isPseudoRoot = false; } - + return p; } diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index b077f333f1..174bb73f65 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -22,14 +22,12 @@ * $Id$ */ -#include "common/stdafx.h" #include "common/scummsys.h" #if defined(UNIX) && defined(USE_ALSA) #include "sound/mpu401.h" -#include "common/stdafx.h" #include "common/util.h" #include "common/config-manager.h" diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index e14ab24e79..54777f6c69 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -24,7 +24,6 @@ #ifdef MACOSX -#include "common/stdafx.h" #include "common/config-manager.h" #include "common/util.h" #include "sound/mpu401.h" diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp index aa8790a83e..251b41a986 100644 --- a/backends/midi/coremidi.cpp +++ b/backends/midi/coremidi.cpp @@ -24,7 +24,6 @@ #ifdef MACOSX -#include "common/stdafx.h" #include "common/config-manager.h" #include "common/util.h" #include "sound/mpu401.h" @@ -91,8 +90,8 @@ int MidiDriver_CoreMIDI::open() { } else { return MERR_DEVICE_NOT_AVAILABLE; } - - if (err != noErr) + + if (err != noErr) return MERR_CANNOT_CONNECT; return 0; diff --git a/backends/midi/morphos.cpp b/backends/midi/morphos.cpp index 530967c331..1a322dc6e2 100644 --- a/backends/midi/morphos.cpp +++ b/backends/midi/morphos.cpp @@ -33,7 +33,6 @@ #include <proto/dos.h> #include <proto/etude.h> -#include "common/stdafx.h" #include "common/endian.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp index cb5aafd170..39c61dd85b 100644 --- a/backends/midi/seq.cpp +++ b/backends/midi/seq.cpp @@ -30,7 +30,6 @@ #if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index 5f53c59173..db3ed50165 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -27,7 +27,6 @@ #include <windows.h> #include <mmsystem.h> -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/ypa1.cpp b/backends/midi/ypa1.cpp index da84211753..ca77de7300 100644 --- a/backends/midi/ypa1.cpp +++ b/backends/midi/ypa1.cpp @@ -22,7 +22,6 @@ * $Id$ */ -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/zodiac.cpp b/backends/midi/zodiac.cpp index 349635f8b2..10a9d166b4 100644 --- a/backends/midi/zodiac.cpp +++ b/backends/midi/zodiac.cpp @@ -22,7 +22,6 @@ * $Id$ */ -#include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" @@ -113,7 +112,7 @@ void MidiDriver_Zodiac::send(uint32 b) { void MidiDriver_Zodiac::sysEx(const byte *msg, uint16 length) { unsigned char buf[256]; - + buf[0] = 0xF0; memcpy(buf + 1, msg, length); buf[length + 1] = 0xF7; diff --git a/backends/platform/PalmOS/Src/be_base.h b/backends/platform/PalmOS/Src/be_base.h index 0520d4bfdc..a4c27cf2da 100644 --- a/backends/platform/PalmOS/Src/be_base.h +++ b/backends/platform/PalmOS/Src/be_base.h @@ -29,7 +29,6 @@ #include "PalmVersion.h" #include "globals.h" -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "common/events.h" diff --git a/backends/platform/PalmOS/Src/be_save.h b/backends/platform/PalmOS/Src/be_save.h index 56b1b5e7a0..cad5855551 100755 --- a/backends/platform/PalmOS/Src/be_save.h +++ b/backends/platform/PalmOS/Src/be_save.h @@ -26,7 +26,6 @@ #ifndef BACKEND_SAVES_PALM_H #define BACKEND_SAVES_PALM_H -#include "common/stdafx.h" #include "saves/default/default-saves.h" class PalmSaveFileManager : public DefaultSaveFileManager { diff --git a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp b/backends/platform/PalmOS/Src/cd_aeroplayer.cpp index 7e9ae5d1bd..e1785c9239 100644 --- a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp +++ b/backends/platform/PalmOS/Src/cd_aeroplayer.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/backends/platform/PalmOS/Src/cd_default.cpp b/backends/platform/PalmOS/Src/cd_default.cpp index e103df6931..416701524d 100644 --- a/backends/platform/PalmOS/Src/cd_default.cpp +++ b/backends/platform/PalmOS/Src/cd_default.cpp @@ -22,7 +22,6 @@ * $Id$ * */ -#include "common/stdafx.h" #include "common/system.h" #include "cd_default.h" diff --git a/backends/platform/PalmOS/Src/cd_msa.cpp b/backends/platform/PalmOS/Src/cd_msa.cpp index 5fb1a0c12f..1a9752852e 100644 --- a/backends/platform/PalmOS/Src/cd_msa.cpp +++ b/backends/platform/PalmOS/Src/cd_msa.cpp @@ -23,7 +23,6 @@ * */ #include <SonyClie.h> -#include "common/stdafx.h" #include "common/system.h" #include "cd_msa.h" #include "start.h" // for appFileCreat diff --git a/backends/platform/PalmOS/Src/cd_pockettunes.cpp b/backends/platform/PalmOS/Src/cd_pockettunes.cpp index 66483a6e87..b647114fb8 100644 --- a/backends/platform/PalmOS/Src/cd_pockettunes.cpp +++ b/backends/platform/PalmOS/Src/cd_pockettunes.cpp @@ -22,7 +22,6 @@ * $Id$ * */ -#include "common/stdafx.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp index 78b9ac3256..f8c441e2e4 100644 --- a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp +++ b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp @@ -32,7 +32,6 @@ #include "scumm_globals.h" #include "globals.h" -#include "common/stdafx.h" #include "base/version.h" #include "formEditGame.h" diff --git a/backends/platform/PalmOS/Src/native/zodiacARM.cpp b/backends/platform/PalmOS/Src/native/zodiacARM.cpp index ad2f94605f..87de372943 100644 --- a/backends/platform/PalmOS/Src/native/zodiacARM.cpp +++ b/backends/platform/PalmOS/Src/native/zodiacARM.cpp @@ -36,7 +36,6 @@ //#include <AdnDebugMgr.h> //#define DEBUG_ARM -#include "stdafx.h" #include "base/main.h" #ifdef COMPILE_ZODIAC # include "be_zodiac.h" diff --git a/backends/platform/dc/audio.cpp b/backends/platform/dc/audio.cpp index 7364b170e6..5f95a836e8 100644 --- a/backends/platform/dc/audio.cpp +++ b/backends/platform/dc/audio.cpp @@ -23,7 +23,6 @@ * */ -#include <common/stdafx.h> #include <common/scummsys.h> #include "engines/engine.h" #include "sound/mixer.h" diff --git a/backends/platform/dc/dcloader.cpp b/backends/platform/dc/dcloader.cpp index 7e5a068780..2aba1cddf5 100644 --- a/backends/platform/dc/dcloader.cpp +++ b/backends/platform/dc/dcloader.cpp @@ -23,7 +23,6 @@ * */ -#include <common/stdafx.h> #include <ronin/ronin.h> #include <string.h> #include <stdarg.h> diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp index 9c11d0f9da..bada39180c 100644 --- a/backends/platform/dc/dcmain.cpp +++ b/backends/platform/dc/dcmain.cpp @@ -23,7 +23,6 @@ * */ -#include <common/stdafx.h> #include <common/scummsys.h> #include <engines/engine.h> #include <base/main.h> diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp index 9d095e389d..062df16a7e 100644 --- a/backends/platform/dc/display.cpp +++ b/backends/platform/dc/display.cpp @@ -25,7 +25,6 @@ #define RONIN_TIMER_ACCESS -#include <common/stdafx.h> #include <common/scummsys.h> #include <graphics/scaler/intern.h> #include <graphics/surface.h> diff --git a/backends/platform/dc/input.cpp b/backends/platform/dc/input.cpp index 6d7178fc97..be2ac2f178 100644 --- a/backends/platform/dc/input.cpp +++ b/backends/platform/dc/input.cpp @@ -25,7 +25,6 @@ #define RONIN_TIMER_ACCESS -#include <common/stdafx.h> #include <common/scummsys.h> #include <common/events.h> #include "dc.h" diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp index 7c472ccf24..a734a9e13e 100644 --- a/backends/platform/dc/selector.cpp +++ b/backends/platform/dc/selector.cpp @@ -23,7 +23,6 @@ * */ -#include <common/stdafx.h> #include <common/scummsys.h> #include <engines/engine.h> #include <base/plugins.h> diff --git a/backends/platform/dc/softkbd.cpp b/backends/platform/dc/softkbd.cpp index 1f2bd619e1..112eb0c1c0 100644 --- a/backends/platform/dc/softkbd.cpp +++ b/backends/platform/dc/softkbd.cpp @@ -23,7 +23,6 @@ * */ -#include <common/stdafx.h> #include <common/scummsys.h> #include "common/events.h" #include "engines/engine.h" diff --git a/backends/platform/dc/time.cpp b/backends/platform/dc/time.cpp index 890e98f6b4..c87062d583 100644 --- a/backends/platform/dc/time.cpp +++ b/backends/platform/dc/time.cpp @@ -25,7 +25,6 @@ #define RONIN_TIMER_ACCESS -#include <common/stdafx.h> #include <common/scummsys.h> #include "dc.h" diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp index 5b7eaf5f46..39526a48c3 100644 --- a/backends/platform/dc/vmsave.cpp +++ b/backends/platform/dc/vmsave.cpp @@ -23,7 +23,6 @@ * */ -#include <common/stdafx.h> #include <common/scummsys.h> #include "engines/engine.h" #include "dc.h" diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp index 1ce8429a4d..9522dbc9cb 100644 --- a/backends/platform/ds/arm9/source/blitters.cpp +++ b/backends/platform/ds/arm9/source/blitters.cpp @@ -20,7 +20,6 @@ * */ -#include "stdafx.h" #include "blitters.h" #define CHARSET_MASK_TRANSPARENCY 253 diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp index 3a012fc01a..a550ccf968 100644 --- a/backends/platform/ds/arm9/source/cdaudio.cpp +++ b/backends/platform/ds/arm9/source/cdaudio.cpp @@ -20,7 +20,6 @@ * */ -#include "stdafx.h" #include "cdaudio.h" #include "ds-fs.h" #include "config-manager.h" diff --git a/backends/platform/ds/arm9/source/dsmain.h b/backends/platform/ds/arm9/source/dsmain.h index 94f02145a2..a353a7cec8 100644 --- a/backends/platform/ds/arm9/source/dsmain.h +++ b/backends/platform/ds/arm9/source/dsmain.h @@ -24,7 +24,6 @@ #define _DSMAIN_H #include <nds.h> -#include "stdafx.h" #include "osystem_ds.h" #include "scummconsole.h" #include "NDS/scummvm_ipc.h" diff --git a/backends/platform/ds/arm9/source/dsoptions.h b/backends/platform/ds/arm9/source/dsoptions.h index 6976fb1a59..87282142f6 100644 --- a/backends/platform/ds/arm9/source/dsoptions.h +++ b/backends/platform/ds/arm9/source/dsoptions.h @@ -23,7 +23,6 @@ #ifndef _DSOPTIONS_H_ #define _DSOPTIONS_H_ -#include "stdafx.h" #include "common/scummsys.h" #include "common/str.h" diff --git a/backends/platform/ds/arm9/source/gbampsave.h b/backends/platform/ds/arm9/source/gbampsave.h index c7d9732d4c..b9589a29e6 100644 --- a/backends/platform/ds/arm9/source/gbampsave.h +++ b/backends/platform/ds/arm9/source/gbampsave.h @@ -23,7 +23,6 @@ #ifndef _GBAMPSAVE_H_ #define _GBAMPSAVE_H_ -#include "stdafx.h" #include "system.h" #define SAVE_BUFFER_SIZE 100000 diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index 39413d0723..ae5d116985 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -20,7 +20,6 @@ */ -#include "stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "system.h" diff --git a/backends/platform/ds/arm9/source/portdefs.cpp b/backends/platform/ds/arm9/source/portdefs.cpp index 28120e07b8..e669dd5b80 100644 --- a/backends/platform/ds/arm9/source/portdefs.cpp +++ b/backends/platform/ds/arm9/source/portdefs.cpp @@ -20,7 +20,6 @@ * */ -#include "stdafx.h" #include <string.h> #include "nds/dma.h" #include "osystem_ds.h" diff --git a/backends/platform/ds/arm9/source/ramsave.cpp b/backends/platform/ds/arm9/source/ramsave.cpp index ea4bff9cc3..1cd7ff814b 100644 --- a/backends/platform/ds/arm9/source/ramsave.cpp +++ b/backends/platform/ds/arm9/source/ramsave.cpp @@ -20,7 +20,6 @@ * */ // Save in order 1,2,3,4,larger 2,5 -#include "stdafx.h" #include "system.h" #include "ramsave.h" #include "nds.h" diff --git a/backends/platform/ds/arm9/source/scummhelp.cpp b/backends/platform/ds/arm9/source/scummhelp.cpp index 2bbaac4b07..452f782dc5 100644 --- a/backends/platform/ds/arm9/source/scummhelp.cpp +++ b/backends/platform/ds/arm9/source/scummhelp.cpp @@ -20,7 +20,6 @@ * */ -#include "stdafx.h" #include "scummhelp.h" #define ADD_BIND(k,d) do { key[i] = k; dsc[i] = d; i++; } while (0) diff --git a/backends/platform/ds/arm9/source/zipreader.cpp b/backends/platform/ds/arm9/source/zipreader.cpp index 0c86bd97ae..01321f44f5 100644 --- a/backends/platform/ds/arm9/source/zipreader.cpp +++ b/backends/platform/ds/arm9/source/zipreader.cpp @@ -21,7 +21,6 @@ */ -#include "stdafx.h" #include "zipreader.h" #define SWAP_U16(v) (((v & 0xFF) << 8) + (v & 0xFF00)) diff --git a/backends/platform/ds/arm9/source/zipreader.h b/backends/platform/ds/arm9/source/zipreader.h index d4390ab74d..19aa3d9f31 100644 --- a/backends/platform/ds/arm9/source/zipreader.h +++ b/backends/platform/ds/arm9/source/zipreader.h @@ -22,7 +22,6 @@ #ifndef _ZIPREADER_H_ #define _ZIPREADER_H_ -#include "stdafx.h" #include "portdefs.h" #define ZF_SEARCH_START 0x08000000 #define ZF_SEARCH_END 0x09000000 diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h index 1812fdd8d9..4a688bbf9d 100644 --- a/backends/platform/gp2x/gp2x-common.h +++ b/backends/platform/gp2x/gp2x-common.h @@ -29,7 +29,6 @@ #define __GP2X__ #define USE_OSD -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "graphics/scaler.h" diff --git a/backends/platform/gp32/gp32_launcher.cpp b/backends/platform/gp32/gp32_launcher.cpp index 69c9b00e3e..9931118f08 100644 --- a/backends/platform/gp32/gp32_launcher.cpp +++ b/backends/platform/gp32/gp32_launcher.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "common/file.h" diff --git a/backends/platform/gp32/gp32_launcher.h b/backends/platform/gp32/gp32_launcher.h index d7384e4caa..fee9e9b60e 100644 --- a/backends/platform/gp32/gp32_launcher.h +++ b/backends/platform/gp32/gp32_launcher.h @@ -26,7 +26,6 @@ #ifndef __GP32_LAUNCHER_H #define __GP32_LAUNCHER_H -#include "stdafx.h" #include "common/scummsys.h" extern void readConfigVars(); diff --git a/backends/platform/gp32/gp32_main.cpp b/backends/platform/gp32/gp32_main.cpp index 578ef86e4e..e985993e5f 100644 --- a/backends/platform/gp32/gp32_main.cpp +++ b/backends/platform/gp32/gp32_main.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "common/config-manager.h" diff --git a/backends/platform/gp32/gp32_osys.cpp b/backends/platform/gp32/gp32_osys.cpp index f6e0a10bbc..56a9f103ed 100644 --- a/backends/platform/gp32/gp32_osys.cpp +++ b/backends/platform/gp32/gp32_osys.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/gp32/gp32_osys.h b/backends/platform/gp32/gp32_osys.h index 94578e8e15..3c6e0686f4 100644 --- a/backends/platform/gp32/gp32_osys.h +++ b/backends/platform/gp32/gp32_osys.h @@ -27,7 +27,6 @@ #define GP32_OSYS_H //Standard ScummVM includes. -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "backends/intern.h" diff --git a/backends/platform/gp32/gp32std.cpp b/backends/platform/gp32/gp32std.cpp index 7218505436..898d4669b6 100644 --- a/backends/platform/gp32/gp32std.cpp +++ b/backends/platform/gp32/gp32std.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" //#include "graphics/scaler.h" #include "common/system.h" diff --git a/backends/platform/gp32/gp32std_file.cpp b/backends/platform/gp32/gp32std_file.cpp index fcd9acf4da..61fe3da0ee 100644 --- a/backends/platform/gp32/gp32std_file.cpp +++ b/backends/platform/gp32/gp32std_file.cpp @@ -24,7 +24,6 @@ */ -#include "stdafx.h" #include "common/scummsys.h" //#include "graphics/scaler.h" #include "common/system.h" diff --git a/backends/platform/gp32/gp32std_grap.cpp b/backends/platform/gp32/gp32std_grap.cpp index 275513818d..50349d6708 100644 --- a/backends/platform/gp32/gp32std_grap.cpp +++ b/backends/platform/gp32/gp32std_grap.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "backends/intern.h" diff --git a/backends/platform/gp32/gp32std_input.cpp b/backends/platform/gp32/gp32std_input.cpp index de82f8b0bc..a3ad7a00c8 100644 --- a/backends/platform/gp32/gp32std_input.cpp +++ b/backends/platform/gp32/gp32std_input.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "gp32std.h" diff --git a/backends/platform/gp32/gp32std_input.h b/backends/platform/gp32/gp32std_input.h index 6c765d840f..bd784d3432 100644 --- a/backends/platform/gp32/gp32std_input.h +++ b/backends/platform/gp32/gp32std_input.h @@ -26,7 +26,6 @@ #ifndef __GP32STD_INPUT_H #define __GP32STD_INPUT_H -#include "stdafx.h" #include "common/scummsys.h" #define BUTTON_DOWN 1 diff --git a/backends/platform/gp32/gp32std_memory.cpp b/backends/platform/gp32/gp32std_memory.cpp index 449fec9f95..607ea7659a 100644 --- a/backends/platform/gp32/gp32std_memory.cpp +++ b/backends/platform/gp32/gp32std_memory.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" //#include "graphics/scaler.h" #include "common/system.h" diff --git a/backends/platform/gp32/gp32std_sound.cpp b/backends/platform/gp32/gp32std_sound.cpp index 70969bc1b7..71c09c900c 100644 --- a/backends/platform/gp32/gp32std_sound.cpp +++ b/backends/platform/gp32/gp32std_sound.cpp @@ -23,7 +23,6 @@ * */ -#include "stdafx.h" #include "common/scummsys.h" #include "gp32std.h" diff --git a/backends/platform/maemo/maemo-sdl.cpp b/backends/platform/maemo/maemo-sdl.cpp index 7d0c218ca8..cb0141924b 100644 --- a/backends/platform/maemo/maemo-sdl.cpp +++ b/backends/platform/maemo/maemo-sdl.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "backends/platform/maemo/maemo-sdl.h" diff --git a/backends/platform/maemo/maemo-sdl.h b/backends/platform/maemo/maemo-sdl.h index 530af27af6..f45648a9e6 100644 --- a/backends/platform/maemo/maemo-sdl.h +++ b/backends/platform/maemo/maemo-sdl.h @@ -26,7 +26,6 @@ #ifndef MAEMO_SDL_H #define MAEMO_SDL_H -#include "common/stdafx.h" #include "backends/platform/sdl/sdl-common.h" //#include "CEkeys.h" diff --git a/backends/platform/maemo/main.cpp b/backends/platform/maemo/main.cpp index 73a5aff7bc..af5c6b4c10 100644 --- a/backends/platform/maemo/main.cpp +++ b/backends/platform/maemo/main.cpp @@ -23,7 +23,6 @@ * */ -#include <common/stdafx.h> #include <common/scummsys.h> #include <X11/Xlib.h> #include <X11/extensions/Xsp.h> diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp index 250ca0fb29..194a7b6889 100644 --- a/backends/platform/null/null.cpp +++ b/backends/platform/null/null.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/system.h" #include "base/main.h" diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index 6572166e91..f842874850 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include <kernel.h> #include <stdio.h> #include <stdlib.h> diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h index 033431a6fd..beae62dc0e 100644 --- a/backends/platform/ps2/systemps2.h +++ b/backends/platform/ps2/systemps2.h @@ -26,7 +26,6 @@ #ifndef SYSTEMPS2_H #define SYSTEMPS2_H -#include "common/stdafx.h" #include "common/system.h" class Gs2dScreen; diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 5144f5a401..ed615d7955 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/config-manager.h" #include "common/events.h" #include "common/rect.h" diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 7c0932dc20..a7a4834441 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "backends/intern.h" diff --git a/backends/platform/psp/osys_psp_gu.h b/backends/platform/psp/osys_psp_gu.h index 6486e7f3cc..af67be5185 100644 --- a/backends/platform/psp/osys_psp_gu.h +++ b/backends/platform/psp/osys_psp_gu.h @@ -22,7 +22,6 @@ */ #include <pspgu.h> -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/rect.h" diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp index 8cfed7e573..92d6beea74 100644 --- a/backends/platform/psp/psp_main.cpp +++ b/backends/platform/psp/psp_main.cpp @@ -31,7 +31,6 @@ #include <pspdebug.h> #endif -#include <common/stdafx.h> #include <common/system.h> #include <engines/engine.h> #include <base/main.h> diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 35e6dde1cd..fde721c36a 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -28,7 +28,6 @@ #include <SDL.h> -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "graphics/scaler.h" @@ -215,7 +214,7 @@ protected: // unseen game screen SDL_Surface *_screen; - + // TODO: We could get rid of the following two vars and just use _screen instead int _screenWidth, _screenHeight; @@ -272,7 +271,7 @@ protected: int _mode; int _transactionMode; bool _fullscreen; - + bool _screenIsLocked; Graphics::Surface _framebuffer; @@ -368,7 +367,7 @@ protected: Common::SaveFileManager *_savefile; Audio::Mixer *_mixer; - + SDL_TimerID _timerID; Common::TimerManager *_timer; @@ -382,7 +381,7 @@ protected: virtual void drawMouse(); // overloaded by CE backend virtual void undrawMouse(); // overloaded by CE backend (FIXME) virtual void blitCursor(); // overloaded by CE backend (FIXME) - + /** Set the position of the virtual mouse cursor. */ void setMousePos(int x, int y); virtual void fillMouseEvent(Common::Event &event, int x, int y); // overloaded by CE backend @@ -400,8 +399,8 @@ protected: virtual bool saveScreenshot(const char *filename); // overloaded by CE backend int effectiveScreenHeight() const { - return (_adjustAspectRatio ? real2Aspect(_screenHeight) : _screenHeight) - * _scaleFactor; + return (_adjustAspectRatio ? real2Aspect(_screenHeight) : _screenHeight) + * _scaleFactor; } void setupIcon(); diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index 3809253032..23b554c532 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "backends/platform/symbian/src/SymbianActions.h" #include "gui/message.h" diff --git a/backends/platform/symbian/src/SymbianActions.h b/backends/platform/symbian/src/SymbianActions.h index cbd333e500..1e68fbbe46 100644 --- a/backends/platform/symbian/src/SymbianActions.h +++ b/backends/platform/symbian/src/SymbianActions.h @@ -26,7 +26,6 @@ #ifndef SYMBIANACTIONS_H #define SYMBIANACTIONS_H -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "gui/Key.h" diff --git a/backends/platform/wince/CEActionsPocket.cpp b/backends/platform/wince/CEActionsPocket.cpp index efada68ad9..43e2594ac5 100644 --- a/backends/platform/wince/CEActionsPocket.cpp +++ b/backends/platform/wince/CEActionsPocket.cpp @@ -24,7 +24,6 @@ */ -#include "common/stdafx.h" #include "CEActionsPocket.h" #include "EventsBuffer.h" #include "gui/message.h" diff --git a/backends/platform/wince/CEActionsPocket.h b/backends/platform/wince/CEActionsPocket.h index 9749ca60ef..ae0ed19975 100644 --- a/backends/platform/wince/CEActionsPocket.h +++ b/backends/platform/wince/CEActionsPocket.h @@ -26,7 +26,6 @@ #ifndef CEACTIONSPOCKET #define CEACTIONSPOCKET -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "wince-sdl.h" diff --git a/backends/platform/wince/CEActionsSmartphone.cpp b/backends/platform/wince/CEActionsSmartphone.cpp index 227318d552..a04c818070 100644 --- a/backends/platform/wince/CEActionsSmartphone.cpp +++ b/backends/platform/wince/CEActionsSmartphone.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "CEActionsSmartphone.h" #include "EventsBuffer.h" #include "gui/message.h" diff --git a/backends/platform/wince/CEActionsSmartphone.h b/backends/platform/wince/CEActionsSmartphone.h index 590302ef26..eacc571a67 100644 --- a/backends/platform/wince/CEActionsSmartphone.h +++ b/backends/platform/wince/CEActionsSmartphone.h @@ -26,7 +26,6 @@ #ifndef CEACTIONSSMARTPHONE #define CEACTIONSSMARTPHONE -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "wince-sdl.h" diff --git a/backends/platform/wince/CEDevice.cpp b/backends/platform/wince/CEDevice.cpp index 855c601741..7fda42d109 100644 --- a/backends/platform/wince/CEDevice.cpp +++ b/backends/platform/wince/CEDevice.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "CEDevice.h" #include <SDL.h> diff --git a/backends/platform/wince/CEDevice.h b/backends/platform/wince/CEDevice.h index c2dab4e793..9fee8497c2 100644 --- a/backends/platform/wince/CEDevice.h +++ b/backends/platform/wince/CEDevice.h @@ -26,7 +26,6 @@ #ifndef CEDEVICE #define CEDEVICE -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "common/str.h" diff --git a/backends/platform/wince/CELauncherDialog.cpp b/backends/platform/wince/CELauncherDialog.cpp index aef85ebf6c..aac2fdbe7c 100644 --- a/backends/platform/wince/CELauncherDialog.cpp +++ b/backends/platform/wince/CELauncherDialog.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "wince-sdl.h" diff --git a/backends/platform/wince/CEScaler.cpp b/backends/platform/wince/CEScaler.cpp index a09c4dcc65..bb1aaec0be 100644 --- a/backends/platform/wince/CEScaler.cpp +++ b/backends/platform/wince/CEScaler.cpp @@ -23,7 +23,6 @@ * */ #include "graphics/scaler/intern.h" -#include "common/stdafx.h" #include "CEScaler.h" int redblueMasks[] = { 0x7C1F, 0xF81F }; diff --git a/backends/platform/wince/CEScaler.h b/backends/platform/wince/CEScaler.h index b02b0555f1..7a8705a221 100644 --- a/backends/platform/wince/CEScaler.h +++ b/backends/platform/wince/CEScaler.h @@ -26,7 +26,6 @@ #ifndef CESCALER #define CESCALER -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "graphics/scaler.h" diff --git a/backends/platform/wince/CEgui/GUIElement.cpp b/backends/platform/wince/CEgui/GUIElement.cpp index 6c74e7e7e7..a37182e69d 100644 --- a/backends/platform/wince/CEgui/GUIElement.cpp +++ b/backends/platform/wince/CEgui/GUIElement.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "Toolbar.h" #include "SDL_ImageResource.h" diff --git a/backends/platform/wince/CEgui/GUIElement.h b/backends/platform/wince/CEgui/GUIElement.h index ebf80320e7..beb9d95047 100644 --- a/backends/platform/wince/CEgui/GUIElement.h +++ b/backends/platform/wince/CEgui/GUIElement.h @@ -26,7 +26,6 @@ #ifndef CEGUI_GUIELEMENT #define CEGUI_GUIELEMENT -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/ItemAction.cpp b/backends/platform/wince/CEgui/ItemAction.cpp index f9bf903cd2..3808622b2e 100644 --- a/backends/platform/wince/CEgui/ItemAction.cpp +++ b/backends/platform/wince/CEgui/ItemAction.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "ItemAction.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/ItemAction.h b/backends/platform/wince/CEgui/ItemAction.h index 35747374b9..e2cd5b2367 100644 --- a/backends/platform/wince/CEgui/ItemAction.h +++ b/backends/platform/wince/CEgui/ItemAction.h @@ -26,7 +26,6 @@ #ifndef CEGUI_ITEMACTION #define CEGUI_ITEMACTION -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/ItemSwitch.cpp b/backends/platform/wince/CEgui/ItemSwitch.cpp index 7fc32ac67f..445b3bb69b 100644 --- a/backends/platform/wince/CEgui/ItemSwitch.cpp +++ b/backends/platform/wince/CEgui/ItemSwitch.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "ItemSwitch.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/ItemSwitch.h b/backends/platform/wince/CEgui/ItemSwitch.h index cd9dacbc83..1fa5732b6a 100644 --- a/backends/platform/wince/CEgui/ItemSwitch.h +++ b/backends/platform/wince/CEgui/ItemSwitch.h @@ -26,7 +26,6 @@ #ifndef CEGUI_ITEMSWITCH #define CEGUI_ITEMSWITCH -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/Panel.cpp b/backends/platform/wince/CEgui/Panel.cpp index 3d120d87bb..a2d965ca78 100644 --- a/backends/platform/wince/CEgui/Panel.cpp +++ b/backends/platform/wince/CEgui/Panel.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "Panel.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/Panel.h b/backends/platform/wince/CEgui/Panel.h index 549f692ea0..0b55c00dee 100644 --- a/backends/platform/wince/CEgui/Panel.h +++ b/backends/platform/wince/CEgui/Panel.h @@ -26,7 +26,6 @@ #ifndef CEGUI_PANEL #define CEGUI_PANEL -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "common/hashmap.h" diff --git a/backends/platform/wince/CEgui/PanelItem.cpp b/backends/platform/wince/CEgui/PanelItem.cpp index 12353f6d39..0898839c5d 100644 --- a/backends/platform/wince/CEgui/PanelItem.cpp +++ b/backends/platform/wince/CEgui/PanelItem.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "PanelItem.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/PanelItem.h b/backends/platform/wince/CEgui/PanelItem.h index d11f943a6a..82e9b03e22 100644 --- a/backends/platform/wince/CEgui/PanelItem.h +++ b/backends/platform/wince/CEgui/PanelItem.h @@ -26,7 +26,6 @@ #ifndef CEGUI_PANELITEM #define CEGUI_PANELITEM -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/PanelKeyboard.cpp b/backends/platform/wince/CEgui/PanelKeyboard.cpp index 79b833f84b..369a75cae1 100644 --- a/backends/platform/wince/CEgui/PanelKeyboard.cpp +++ b/backends/platform/wince/CEgui/PanelKeyboard.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "PanelKeyboard.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/PanelKeyboard.h b/backends/platform/wince/CEgui/PanelKeyboard.h index d0182ce5fe..5ef4adc73e 100644 --- a/backends/platform/wince/CEgui/PanelKeyboard.h +++ b/backends/platform/wince/CEgui/PanelKeyboard.h @@ -26,7 +26,6 @@ #ifndef CEGUI_PANELKEYBOARD #define CEGUI_PANELKEYBOARD -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.cpp b/backends/platform/wince/CEgui/SDL_ImageResource.cpp index de055f2e54..e1a9d911de 100644 --- a/backends/platform/wince/CEgui/SDL_ImageResource.cpp +++ b/backends/platform/wince/CEgui/SDL_ImageResource.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "SDL_ImageResource.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.h b/backends/platform/wince/CEgui/SDL_ImageResource.h index 3dffbac281..140a11c356 100644 --- a/backends/platform/wince/CEgui/SDL_ImageResource.h +++ b/backends/platform/wince/CEgui/SDL_ImageResource.h @@ -26,7 +26,6 @@ #ifndef CEGUI_SDL_IMAGERESOURCE #define CEGUI_SDL_IMAGERESOURCE -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/Toolbar.cpp b/backends/platform/wince/CEgui/Toolbar.cpp index d8c23b3d08..0501249de9 100644 --- a/backends/platform/wince/CEgui/Toolbar.cpp +++ b/backends/platform/wince/CEgui/Toolbar.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "Toolbar.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/Toolbar.h b/backends/platform/wince/CEgui/Toolbar.h index f60947925e..c23559d315 100644 --- a/backends/platform/wince/CEgui/Toolbar.h +++ b/backends/platform/wince/CEgui/Toolbar.h @@ -26,7 +26,6 @@ #ifndef CEGUI_TOOLBAR #define CEGUI_TOOLBAR -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/wince/CEgui/ToolbarHandler.cpp b/backends/platform/wince/CEgui/ToolbarHandler.cpp index eb65984778..94319901dc 100644 --- a/backends/platform/wince/CEgui/ToolbarHandler.cpp +++ b/backends/platform/wince/CEgui/ToolbarHandler.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "ToolbarHandler.h" namespace CEGUI { diff --git a/backends/platform/wince/CEgui/ToolbarHandler.h b/backends/platform/wince/CEgui/ToolbarHandler.h index 4606d59302..30a299d153 100644 --- a/backends/platform/wince/CEgui/ToolbarHandler.h +++ b/backends/platform/wince/CEgui/ToolbarHandler.h @@ -26,7 +26,6 @@ #ifndef CEGUI_TOOLBARHANDLER #define CEGUI_TOOLBARHANDLER -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "common/str.h" diff --git a/backends/platform/wince/CEkeys/EventsBuffer.cpp b/backends/platform/wince/CEkeys/EventsBuffer.cpp index 19978c23dc..92a21ab7ad 100644 --- a/backends/platform/wince/CEkeys/EventsBuffer.cpp +++ b/backends/platform/wince/CEkeys/EventsBuffer.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "EventsBuffer.h" namespace CEKEYS { diff --git a/backends/platform/wince/CEkeys/EventsBuffer.h b/backends/platform/wince/CEkeys/EventsBuffer.h index 541e1b15c8..2e13770d25 100644 --- a/backends/platform/wince/CEkeys/EventsBuffer.h +++ b/backends/platform/wince/CEkeys/EventsBuffer.h @@ -26,7 +26,6 @@ #ifndef CEKEYS_EVENTSBUFFER #define CEKEYS_EVENTSBUFFER -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "common/list.h" diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp index c19ac3d898..5353c9e39d 100644 --- a/backends/platform/wince/wince-sdl.cpp +++ b/backends/platform/wince/wince-sdl.cpp @@ -25,7 +25,6 @@ // NOTE: formatted for tabstop=4 -#include "common/stdafx.h" #include "backends/platform/wince/wince-sdl.h" #include "common/config-manager.h" diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h index e74c438807..ab1e896bf9 100644 --- a/backends/platform/wince/wince-sdl.h +++ b/backends/platform/wince/wince-sdl.h @@ -26,7 +26,6 @@ #ifndef WINCE_SDL_H #define WINCE_SDL_H -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/system.h" #include "graphics/scaler.h" diff --git a/backends/platform/x11/x11.cpp b/backends/platform/x11/x11.cpp index 56e9b2a79b..e82b4bf2d6 100644 --- a/backends/platform/x11/x11.cpp +++ b/backends/platform/x11/x11.cpp @@ -25,7 +25,6 @@ /* The bare pure X11 port done by Lionel 'BBrox' Ulmer */ -#include "common/stdafx.h" #include "common/scummsys.h" #include "common/events.h" #include "common/system.h" diff --git a/backends/plugins/dc/dc-provider.h b/backends/plugins/dc/dc-provider.h index e4db3090ee..bcf4305bba 100644 --- a/backends/plugins/dc/dc-provider.h +++ b/backends/plugins/dc/dc-provider.h @@ -26,7 +26,6 @@ #ifndef BACKENDS_PLUGINS_DC_H #define BACKENDS_PLUGINS_DC_H -#include "common/stdafx.h" #include "base/plugins.h" #if defined(DYNAMIC_MODULES) && defined(__DC__) diff --git a/backends/plugins/dynamic-plugin.h b/backends/plugins/dynamic-plugin.h index dd3b84fb53..a7a8eb5b96 100644 --- a/backends/plugins/dynamic-plugin.h +++ b/backends/plugins/dynamic-plugin.h @@ -26,7 +26,6 @@ #ifndef BACKENDS_PLUGINS_DYNAMICPLUGIN_H #define BACKENDS_PLUGINS_DYNAMICPLUGIN_H -#include "common/stdafx.h" #include "base/plugins.h" diff --git a/backends/plugins/posix/posix-provider.h b/backends/plugins/posix/posix-provider.h index df9e81c741..5795ba811f 100644 --- a/backends/plugins/posix/posix-provider.h +++ b/backends/plugins/posix/posix-provider.h @@ -26,7 +26,6 @@ #ifndef BACKENDS_PLUGINS_POSIX_H #define BACKENDS_PLUGINS_POSIX_H -#include "common/stdafx.h" #include "base/plugins.h" #if defined(DYNAMIC_MODULES) && defined(UNIX) diff --git a/backends/plugins/sdl/sdl-provider.h b/backends/plugins/sdl/sdl-provider.h index 87607d6a19..5a82f26079 100644 --- a/backends/plugins/sdl/sdl-provider.h +++ b/backends/plugins/sdl/sdl-provider.h @@ -26,7 +26,6 @@ #ifndef BACKENDS_PLUGINS_SDL_H #define BACKENDS_PLUGINS_SDL_H -#include "common/stdafx.h" #include "base/plugins.h" #if defined(DYNAMIC_MODULES) && defined(SDL_BACKEND) diff --git a/backends/plugins/win32/win32-provider.h b/backends/plugins/win32/win32-provider.h index d653c5b534..985ffa42c1 100644 --- a/backends/plugins/win32/win32-provider.h +++ b/backends/plugins/win32/win32-provider.h @@ -26,7 +26,6 @@ #ifndef BACKENDS_PLUGINS_WIN32_H #define BACKENDS_PLUGINS_WIN32_H -#include "common/stdafx.h" #include "base/plugins.h" #if defined(DYNAMIC_MODULES) && defined(_WIN32) diff --git a/backends/saves/compressed/compressed-saves.cpp b/backends/saves/compressed/compressed-saves.cpp index dae2c707ef..150cf5c47d 100644 --- a/backends/saves/compressed/compressed-saves.cpp +++ b/backends/saves/compressed/compressed-saves.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/savefile.h" #include "common/util.h" #include "backends/saves/compressed/compressed-saves.h" @@ -45,7 +44,7 @@ protected: enum { BUFSIZE = 16384 // 1 << MAX_WBITS }; - + byte _buf[BUFSIZE]; Common::InSaveFile *_wrapped; @@ -62,13 +61,13 @@ public: _stream.zalloc = Z_NULL; _stream.zfree = Z_NULL; _stream.opaque = Z_NULL; - + // Verify file header is correct once more w->seek(0, SEEK_SET); uint16 header = w->readUint16BE(); assert(header == 0x1F8B || ((header & 0x0F00) == 0x0800 && header % 31 == 0)); - + if (header == 0x1F8B) { // Retrieve the original file size w->seek(-4, SEEK_END); @@ -79,7 +78,7 @@ public: } _pos = 0; w->seek(0, SEEK_SET); - + // Adding 32 to windowBits indicates to zlib that it is supposed to // automatically detect whether gzip or zlib headers are used for // the compressed file. This feature was added in zlib 1.2.0.4, @@ -88,7 +87,7 @@ public: _zlibErr = inflateInit2(&_stream, MAX_WBITS + 32); if (_zlibErr != Z_OK) return; - + // Setup input buffer _stream.next_in = _buf; _stream.avail_in = 0; @@ -115,7 +114,7 @@ public: } _zlibErr = inflate(&_stream, Z_NO_FLUSH); } - + // Update the position counter _pos += dataSize - _stream.avail_out; @@ -155,7 +154,7 @@ public: // in the constructor, and wrap it into a MemoryReadStream -- but that // would be rather wasteful. As long as we don't need it, I'd rather not // implement this at all. -- Fingolfin - + // Skip the given amount of data (very inefficient if one tries to skip // huge amounts of data, but usually client code will only skip a few // bytes, so this should be fine. @@ -176,7 +175,7 @@ protected: enum { BUFSIZE = 16384 // 1 << MAX_WBITS }; - + byte _buf[BUFSIZE]; Common::OutSaveFile *_wrapped; z_stream _stream; @@ -203,7 +202,7 @@ public: _stream.zalloc = Z_NULL; _stream.zfree = Z_NULL; _stream.opaque = Z_NULL; - + // Adding 16 to windowBits indicates to zlib that it is supposed to // write gzip headers. This feature was added in zlib 1.2.0.4, // released 10 August 2003. @@ -267,7 +266,7 @@ public: // of the const keyword. _stream.next_in = const_cast<byte *>((const byte *)dataPtr); _stream.avail_in = dataSize; - + // ... and flush it to disk processData(Z_NO_FLUSH); diff --git a/backends/saves/compressed/compressed-saves.h b/backends/saves/compressed/compressed-saves.h index 031007ef8b..205c5db05b 100644 --- a/backends/saves/compressed/compressed-saves.h +++ b/backends/saves/compressed/compressed-saves.h @@ -26,7 +26,6 @@ #ifndef BACKEND_SAVES_COMPRESSED_H #define BACKEND_SAVES_COMPRESSED_H -#include "common/stdafx.h" #include "common/savefile.h" /** diff --git a/backends/saves/default/default-saves.cpp b/backends/saves/default/default-saves.cpp index f4742f15a0..702b404434 100644 --- a/backends/saves/default/default-saves.cpp +++ b/backends/saves/default/default-saves.cpp @@ -25,7 +25,6 @@ #if !defined(DISABLE_DEFAULT_SAVEFILEMANAGER) -#include "common/stdafx.h" #include "common/savefile.h" #include "common/util.h" #include "common/fs.h" @@ -119,13 +118,13 @@ Common::StringList DefaultSaveFileManager::listSavefiles(const char *regex) { FSList savefiles; Common::StringList results; Common::String search(regex); - + if (savePath.lookupFile(savefiles, savePath, search, false, true)) { for (FSList::const_iterator file = savefiles.begin(); file != savefiles.end(); file++) { results.push_back(file->getPath()); } } - + return results; } @@ -148,11 +147,11 @@ Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename) // Ensure that the savepath exists and is writeable. If not, generate // an appropriate error const char *savePath = getSavePath(); - + #if defined(UNIX) || defined(__SYMBIAN32__) struct stat sb; clearError(); - + // Check whether the dir exists if (stat(savePath, &sb) == -1) { // The dir does not exist, or stat failed for some other reason. @@ -174,7 +173,7 @@ Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename) // or is not writeable, the path could be completly bogus, etc. warning("mkdir for '%s' failed!", savePath); perror("mkdir"); - + switch (errno) { case EACCES: setError(SFM_DIR_ACCESS, Common::String("Search or write permission denied")); @@ -198,19 +197,19 @@ Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename) setError(SFM_DIR_ROFS, Common::String("The parent directory resides on a read-only file system")); break; } - + return 0; } break; case ENOTDIR: setError(SFM_DIR_NOTDIR, Common::String("A component of the path prefix is not a directory")); break; - } + } } else { // So stat() succeeded. But is the path actually pointing to a directory? if (!S_ISDIR(sb.st_mode)) { setError(SFM_DIR_NOTDIR, Common::String("The given savepath is not a directory")); - + return 0; } } @@ -225,7 +224,7 @@ Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename) delete sf; sf = 0; } - + return wrapOutSaveFile(sf); } diff --git a/backends/saves/default/default-saves.h b/backends/saves/default/default-saves.h index 9346e79700..8c4fe54bb7 100644 --- a/backends/saves/default/default-saves.h +++ b/backends/saves/default/default-saves.h @@ -26,7 +26,6 @@ #if !defined(BACKEND_SAVES_DEFAULT_H) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER) #define BACKEND_SAVES_DEFAULT_H -#include "common/stdafx.h" #include "common/savefile.h" #include "common/str.h" diff --git a/backends/saves/savefile.cpp b/backends/saves/savefile.cpp index 4b50e9c57d..499edb0b28 100644 --- a/backends/saves/savefile.cpp +++ b/backends/saves/savefile.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/util.h" #include "common/config-manager.h" #include "common/savefile.h" diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp index 5dfb3bdc83..8d766740c4 100644 --- a/backends/timer/default/default-timer.cpp +++ b/backends/timer/default/default-timer.cpp @@ -22,7 +22,6 @@ * $Id$ */ -#include "common/stdafx.h" #include "common/scummsys.h" #include "backends/timer/default/default-timer.h" #include "common/util.h" @@ -36,14 +35,14 @@ struct TimerSlot { uint32 nextFireTime; // in milliseconds uint32 nextFireTimeMicro; // mircoseconds part of nextFire - + TimerSlot *next; }; void insertPrioQueue(TimerSlot *head, TimerSlot *newSlot) { // The head points to a fake anchor TimerSlot; this common // trick allows us to get rid of many special cases. - + const uint32 nextFireTime = newSlot->nextFireTime; TimerSlot *slot = head; newSlot->next = 0; @@ -65,14 +64,14 @@ void insertPrioQueue(TimerSlot *head, TimerSlot *newSlot) { DefaultTimerManager::DefaultTimerManager() : _timerHandler(0), _head(0) { - + _head = new TimerSlot(); memset(_head, 0, sizeof(TimerSlot)); } DefaultTimerManager::~DefaultTimerManager() { Common::StackLock lock(_mutex); - + TimerSlot *slot = _head; while (slot) { TimerSlot *next = slot->next; @@ -86,13 +85,13 @@ void DefaultTimerManager::handler() { Common::StackLock lock(_mutex); const uint32 curTime = g_system->getMillis(); - + // Repeat as long as there is a TimerSlot that is scheduled to fire. TimerSlot *slot = _head->next; while (slot && slot->nextFireTime < curTime) { // Remove the slot from the priority queue _head->next = slot->next; - + // Update the fire time and reinsert the TimerSlot into the priority // queue. Has to be done before the timer callback is invoked, in case // the callback wants to remove itself. @@ -108,7 +107,7 @@ void DefaultTimerManager::handler() { // Invoke the timer callback assert(slot->callback); slot->callback(slot->refCon); - + // Look at the next scheduled timer slot = _head->next; } @@ -117,7 +116,7 @@ void DefaultTimerManager::handler() { bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, void *refCon) { assert(interval > 0); Common::StackLock lock(_mutex); - + TimerSlot *slot = new TimerSlot; slot->callback = callback; slot->refCon = refCon; @@ -125,7 +124,7 @@ bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, v slot->nextFireTime = g_system->getMillis() + interval / 1000; slot->nextFireTimeMicro = interval % 1000; slot->next = 0; - + insertPrioQueue(_head, slot); return true; @@ -135,7 +134,7 @@ void DefaultTimerManager::removeTimerProc(TimerProc callback) { Common::StackLock lock(_mutex); TimerSlot *slot = _head; - + while (slot->next) { if (slot->next->callback == callback) { TimerSlot *next = slot->next->next; |