mirror of
https://github.com/libretro/scummvm.git
synced 2025-04-02 06:41:51 +00:00
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
This commit is contained in:
parent
a89694c0d6
commit
258901bab9
@ -87,7 +87,7 @@ clean:
|
||||
.PHONY: all clean dist distclean plugins
|
||||
|
||||
# Old (dumb) compile & dependcy rules
|
||||
#INCS = scumm/scumm.h common/scummsys.h common/stdafx.h
|
||||
#INCS = scumm/scumm.h common/scummsys.h
|
||||
#.cpp.o:
|
||||
# $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
|
||||
#$(OBJS): $(INCS)
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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"
|
||||
|
||||
/*
|
||||
|
@ -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.
|
||||
|
@ -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"
|
||||
|
@ -24,7 +24,6 @@
|
||||
|
||||
#if defined(__DC__)
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "backends/fs/abstract-fs.h"
|
||||
|
||||
#include <ronin/cdfs.h>
|
||||
|
@ -20,7 +20,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "str.h"
|
||||
#include "common/util.h"
|
||||
//#include <NDS/ARM9/console.h> //basic print funcionality
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "backends/fs/abstract-fs.h"
|
||||
|
||||
#define MAX_PATH_SIZE 256
|
||||
|
@ -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"
|
||||
|
@ -27,7 +27,6 @@
|
||||
#include "PalmVersion.h"
|
||||
#include "globals.h"
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "backends/fs/abstract-fs.h"
|
||||
|
||||
/**
|
||||
|
@ -24,7 +24,6 @@
|
||||
|
||||
#if defined(UNIX)
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "backends/fs/abstract-fs.h"
|
||||
|
||||
#ifdef MACOSX
|
||||
|
@ -23,7 +23,6 @@
|
||||
*/
|
||||
|
||||
#if defined (__SYMBIAN32__)
|
||||
#include "common/stdafx.h"
|
||||
#include "backends/fs/abstract-fs.h"
|
||||
|
||||
#include <dirent.h>
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -24,7 +24,6 @@
|
||||
|
||||
#ifdef MACOSX
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/config-manager.h"
|
||||
#include "common/util.h"
|
||||
#include "sound/mpu401.h"
|
||||
|
@ -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;
|
||||
|
@ -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"
|
||||
|
@ -30,7 +30,6 @@
|
||||
|
||||
#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__)
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "sound/mpu401.h"
|
||||
#include "common/util.h"
|
||||
|
||||
|
@ -27,7 +27,6 @@
|
||||
|
||||
#include <windows.h>
|
||||
#include <mmsystem.h>
|
||||
#include "common/stdafx.h"
|
||||
#include "sound/mpu401.h"
|
||||
#include "common/util.h"
|
||||
|
||||
|
@ -22,7 +22,6 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "sound/mpu401.h"
|
||||
#include "common/util.h"
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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"
|
||||
|
@ -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 {
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/system.h"
|
||||
#include "common/config-manager.h"
|
||||
|
||||
|
@ -22,7 +22,6 @@
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
#include "common/stdafx.h"
|
||||
#include "common/system.h"
|
||||
#include "cd_default.h"
|
||||
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
#include <SonyClie.h>
|
||||
#include "common/stdafx.h"
|
||||
#include "common/system.h"
|
||||
#include "cd_msa.h"
|
||||
#include "start.h" // for appFileCreat
|
||||
|
@ -22,7 +22,6 @@
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
#include "common/stdafx.h"
|
||||
#include "common/system.h"
|
||||
#include "common/config-manager.h"
|
||||
|
||||
|
@ -32,7 +32,6 @@
|
||||
#include "scumm_globals.h"
|
||||
#include "globals.h"
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "base/version.h"
|
||||
|
||||
#include "formEditGame.h"
|
||||
|
@ -36,7 +36,6 @@
|
||||
//#include <AdnDebugMgr.h>
|
||||
//#define DEBUG_ARM
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "base/main.h"
|
||||
#ifdef COMPILE_ZODIAC
|
||||
# include "be_zodiac.h"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <common/stdafx.h>
|
||||
#include <common/scummsys.h>
|
||||
#include "engines/engine.h"
|
||||
#include "sound/mixer.h"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <common/stdafx.h>
|
||||
#include <ronin/ronin.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <common/stdafx.h>
|
||||
#include <common/scummsys.h>
|
||||
#include <engines/engine.h>
|
||||
#include <base/main.h>
|
||||
|
@ -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>
|
||||
|
@ -25,7 +25,6 @@
|
||||
|
||||
#define RONIN_TIMER_ACCESS
|
||||
|
||||
#include <common/stdafx.h>
|
||||
#include <common/scummsys.h>
|
||||
#include <common/events.h>
|
||||
#include "dc.h"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <common/stdafx.h>
|
||||
#include <common/scummsys.h>
|
||||
#include <engines/engine.h>
|
||||
#include <base/plugins.h>
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <common/stdafx.h>
|
||||
#include <common/scummsys.h>
|
||||
#include "common/events.h"
|
||||
#include "engines/engine.h"
|
||||
|
@ -25,7 +25,6 @@
|
||||
|
||||
#define RONIN_TIMER_ACCESS
|
||||
|
||||
#include <common/stdafx.h>
|
||||
#include <common/scummsys.h>
|
||||
#include "dc.h"
|
||||
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <common/stdafx.h>
|
||||
#include <common/scummsys.h>
|
||||
#include "engines/engine.h"
|
||||
#include "dc.h"
|
||||
|
@ -20,7 +20,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "blitters.h"
|
||||
#define CHARSET_MASK_TRANSPARENCY 253
|
||||
|
||||
|
@ -20,7 +20,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "cdaudio.h"
|
||||
#include "ds-fs.h"
|
||||
#include "config-manager.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"
|
||||
|
@ -23,7 +23,6 @@
|
||||
#ifndef _DSOPTIONS_H_
|
||||
#define _DSOPTIONS_H_
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "common/scummsys.h"
|
||||
#include "common/str.h"
|
||||
|
@ -23,7 +23,6 @@
|
||||
#ifndef _GBAMPSAVE_H_
|
||||
#define _GBAMPSAVE_H_
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "system.h"
|
||||
|
||||
#define SAVE_BUFFER_SIZE 100000
|
||||
|
@ -20,7 +20,6 @@
|
||||
*/
|
||||
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.h"
|
||||
#include "system.h"
|
||||
|
@ -20,7 +20,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include <string.h>
|
||||
#include "nds/dma.h"
|
||||
#include "osystem_ds.h"
|
||||
|
@ -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"
|
||||
|
@ -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)
|
||||
|
@ -21,7 +21,6 @@
|
||||
*/
|
||||
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "zipreader.h"
|
||||
|
||||
#define SWAP_U16(v) (((v & 0xFF) << 8) + (v & 0xFF00))
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/file.h"
|
||||
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifndef __GP32_LAUNCHER_H
|
||||
#define __GP32_LAUNCHER_H
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
|
||||
extern void readConfigVars();
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
|
||||
#include "common/config-manager.h"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.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"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
//#include "graphics/scaler.h"
|
||||
#include "common/system.h"
|
||||
|
@ -24,7 +24,6 @@
|
||||
*/
|
||||
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
//#include "graphics/scaler.h"
|
||||
#include "common/system.h"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.h"
|
||||
#include "backends/intern.h"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
|
||||
#include "gp32std.h"
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifndef __GP32STD_INPUT_H
|
||||
#define __GP32STD_INPUT_H
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
|
||||
#define BUTTON_DOWN 1
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
//#include "graphics/scaler.h"
|
||||
#include "common/system.h"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
|
||||
#include "gp32std.h"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "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"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <common/stdafx.h>
|
||||
#include <common/scummsys.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/extensions/Xsp.h>
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/system.h"
|
||||
#include "base/main.h"
|
||||
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include <kernel.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifndef SYSTEMPS2_H
|
||||
#define SYSTEMPS2_H
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/system.h"
|
||||
|
||||
class Gs2dScreen;
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/config-manager.h"
|
||||
#include "common/events.h"
|
||||
#include "common/rect.h"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.h"
|
||||
#include "backends/intern.h"
|
||||
|
@ -22,7 +22,6 @@
|
||||
*/
|
||||
|
||||
#include <pspgu.h>
|
||||
#include "common/stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
|
||||
#include "common/rect.h"
|
||||
|
@ -31,7 +31,6 @@
|
||||
#include <pspdebug.h>
|
||||
#endif
|
||||
|
||||
#include <common/stdafx.h>
|
||||
#include <common/system.h>
|
||||
#include <engines/engine.h>
|
||||
#include <base/main.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();
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "backends/platform/symbian/src/SymbianActions.h"
|
||||
|
||||
#include "gui/message.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"
|
||||
|
@ -24,7 +24,6 @@
|
||||
*/
|
||||
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "CEActionsPocket.h"
|
||||
#include "EventsBuffer.h"
|
||||
#include "gui/message.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"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "CEActionsSmartphone.h"
|
||||
#include "EventsBuffer.h"
|
||||
#include "gui/message.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"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "CEDevice.h"
|
||||
|
||||
#include <SDL.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"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
|
||||
#include "wince-sdl.h"
|
||||
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
#include "graphics/scaler/intern.h"
|
||||
#include "common/stdafx.h"
|
||||
#include "CEScaler.h"
|
||||
|
||||
int redblueMasks[] = { 0x7C1F, 0xF81F };
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifndef CESCALER
|
||||
#define CESCALER
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.h"
|
||||
#include "graphics/scaler.h"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "Toolbar.h"
|
||||
|
||||
#include "SDL_ImageResource.h"
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifndef CEGUI_GUIELEMENT
|
||||
#define CEGUI_GUIELEMENT
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.h"
|
||||
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "ItemAction.h"
|
||||
|
||||
namespace CEGUI {
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifndef CEGUI_ITEMACTION
|
||||
#define CEGUI_ITEMACTION
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.h"
|
||||
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "ItemSwitch.h"
|
||||
|
||||
namespace CEGUI {
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifndef CEGUI_ITEMSWITCH
|
||||
#define CEGUI_ITEMSWITCH
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.h"
|
||||
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "Panel.h"
|
||||
|
||||
namespace CEGUI {
|
||||
|
@ -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"
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "PanelItem.h"
|
||||
|
||||
namespace CEGUI {
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifndef CEGUI_PANELITEM
|
||||
#define CEGUI_PANELITEM
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.h"
|
||||
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "PanelKeyboard.h"
|
||||
|
||||
namespace CEGUI {
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifndef CEGUI_PANELKEYBOARD
|
||||
#define CEGUI_PANELKEYBOARD
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.h"
|
||||
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "SDL_ImageResource.h"
|
||||
|
||||
namespace CEGUI {
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifndef CEGUI_SDL_IMAGERESOURCE
|
||||
#define CEGUI_SDL_IMAGERESOURCE
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.h"
|
||||
|
||||
|
@ -23,7 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "Toolbar.h"
|
||||
|
||||
namespace CEGUI {
|
||||
|
@ -26,7 +26,6 @@
|
||||
#ifndef CEGUI_TOOLBAR
|
||||
#define CEGUI_TOOLBAR
|
||||
|
||||
#include "common/stdafx.h"
|
||||
#include "common/scummsys.h"
|
||||
#include "common/system.h"
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user