diff options
| author | Tony Puccinelli | 2010-06-05 01:05:19 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-06-05 01:05:19 +0000 |
| commit | 95e56f2052956e80a6319b2916a8f899340effaf (patch) | |
| tree | f9525eb32e05f1a4746233fe3daf254d07cb83ab /backends/platform/sdl/sdl.h | |
| parent | 28e28a2fea9f6adf4967463024c609e6a01ac5b0 (diff) | |
| parent | 3a5fe4ca002a85f7c4549c8d36203553553c53f9 (diff) | |
| download | scummvm-rg350-95e56f2052956e80a6319b2916a8f899340effaf.tar.gz scummvm-rg350-95e56f2052956e80a6319b2916a8f899340effaf.tar.bz2 scummvm-rg350-95e56f2052956e80a6319b2916a8f899340effaf.zip | |
merged trunk into branch and corrected __PS2__ to __PLAYSTATION2__ in a couple files
svn-id: r49435
Diffstat (limited to 'backends/platform/sdl/sdl.h')
| -rw-r--r-- | backends/platform/sdl/sdl.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index b178d58994..b6baa52391 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -289,10 +289,6 @@ protected: uint32 _cdEndTime, _cdStopTime; enum { - DF_WANT_RECT_OPTIM = 1 << 0 - }; - - enum { kTransactionNone = 0, kTransactionActive = 1, kTransactionRollback = 2 @@ -340,7 +336,6 @@ protected: Graphics::Surface _framebuffer; /** Current video mode flags (see DF_* constants) */ - uint32 _modeFlags; bool _modeChanged; int _screenChangeCount; @@ -352,9 +347,6 @@ protected: // Dirty rect management SDL_Rect _dirtyRectList[NUM_DIRTY_RECT]; int _numDirtyRects; - uint32 *_dirtyChecksums; - bool _cksumValid; - int _cksumNum; // Keyboard mouse emulation. Disabled by fingolfin 2004-12-18. // I am keeping the rest of the code in for now, since the joystick @@ -420,11 +412,11 @@ protected: int _newShakePos; // Palette data - SDL_Color *_currentPalette; + SDL_Color _currentPalette[256]; uint _paletteDirtyStart, _paletteDirtyEnd; // Cursor palette data - SDL_Color *_cursorPalette; + SDL_Color _cursorPalette[256]; /** * Mutex which prevents multiple threads from interfering with each other @@ -457,9 +449,6 @@ protected: Common::TimerManager *_timer; protected: - void addDirtyRgnAuto(const byte *buf); - void makeChecksums(const byte *buf); - virtual void addDirtyRect(int x, int y, int w, int h, bool realCoordinates = false); // overloaded by CE backend virtual void drawMouse(); // overloaded by CE backend |