diff options
author | John Willis | 2009-04-16 10:40:14 +0000 |
---|---|---|
committer | John Willis | 2009-04-16 10:40:14 +0000 |
commit | 08eb58aab8c3c368129107a47f64755abb85e704 (patch) | |
tree | a00ac1edb102946c396b63521480edb7190dffe5 /backends/platform/gp2x/gp2x-common.h | |
parent | 9a23f069feba73a2b366bfec3ed6b9bf59904486 (diff) | |
download | scummvm-rg350-08eb58aab8c3c368129107a47f64755abb85e704.tar.gz scummvm-rg350-08eb58aab8c3c368129107a47f64755abb85e704.tar.bz2 scummvm-rg350-08eb58aab8c3c368129107a47f64755abb85e704.zip |
Push local cleanup into the 0.13 branch in prep. for 0.13.1.
svn-id: r39960
Diffstat (limited to 'backends/platform/gp2x/gp2x-common.h')
-rw-r--r-- | backends/platform/gp2x/gp2x-common.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h index 7341b0646f..2b8f7c091e 100644 --- a/backends/platform/gp2x/gp2x-common.h +++ b/backends/platform/gp2x/gp2x-common.h @@ -29,13 +29,15 @@ #include <SDL.h> #include <SDL_gp2x.h> -#include "backends/base-backend.h" +#include "common/scummsys.h" +#include "common/system.h" #include "graphics/scaler.h" #define __GP2X__ #define USE_OSD -/* #define DISABLE_SCALERS */ -#define MIXER_DOUBLE_BUFFERING 1 +/* #define DISABLE_SCALERS +#define MIXER_DOUBLE_BUFFERING 1 */ + namespace Audio { class MixerImpl; @@ -57,7 +59,7 @@ enum { }; -class OSystem_GP2X : public BaseBackend { +class OSystem_GP2X : public OSystem { public: OSystem_GP2X(); virtual ~OSystem_GP2X(); @@ -187,8 +189,8 @@ public: virtual FilesystemFactory *getFilesystemFactory(); virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); - virtual Common::SeekableReadStream *createConfigReadStream(); - virtual Common::WriteStream *createConfigWriteStream(); + virtual Common::SeekableReadStream *openConfigFileForReading(); + virtual Common::WriteStream *openConfigFileForWriting(); protected: bool _inited; @@ -283,7 +285,6 @@ protected: enum { NUM_DIRTY_RECT = 100, - MAX_MOUSE_W = 80, MAX_MOUSE_H = 80, MAX_SCALING = 3 |