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 /backends/platform/sdl | |
| 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 'backends/platform/sdl')
| -rw-r--r-- | backends/platform/sdl/sdl.h | 13 |
1 files changed, 6 insertions, 7 deletions
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(); |