diff options
| author | Max Horn | 2003-09-14 12:52:38 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-14 12:52:38 +0000 |
| commit | ad09725b3e0f95cc08cc8fb00f14a58cf61b9a72 (patch) | |
| tree | d0328b9a65184b070ae59fb5c1b7bd5ea04859ab /backends/sdl/sdl-common.h | |
| parent | dbc29272e9e5ec3a8d2f83a0781bd90549b221ea (diff) | |
| download | scummvm-rg350-ad09725b3e0f95cc08cc8fb00f14a58cf61b9a72.tar.gz scummvm-rg350-ad09725b3e0f95cc08cc8fb00f14a58cf61b9a72.tar.bz2 scummvm-rg350-ad09725b3e0f95cc08cc8fb00f14a58cf61b9a72.zip | |
evil fix for #bug 801293 (ALL: Ctrl+alt+b opengl switch) and some cleanup
svn-id: r10248
Diffstat (limited to 'backends/sdl/sdl-common.h')
| -rw-r--r-- | backends/sdl/sdl-common.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h index 439e52124b..a36ea2dbff 100644 --- a/backends/sdl/sdl-common.h +++ b/backends/sdl/sdl-common.h @@ -149,7 +149,8 @@ protected: enum { DF_WANT_RECT_OPTIM = 1 << 0, - DF_UPDATE_EXPAND_1_PIXEL = 1 << 3 + DF_UPDATE_EXPAND_1_PIXEL = 1 << 1, + DF_REVERSE_Y = 1 << 2 }; bool _forceFull; // Force full redraw on next update_screen @@ -185,9 +186,7 @@ protected: MousePos() : x(0), y(0), w(0), h(0) {} }; - // joystick - SDL_Joystick *_joystick; - + // mouse bool _mouseVisible; bool _mouseDrawn; const byte *_mouseData; @@ -197,6 +196,9 @@ protected: int16 _mouseHotspotX; int16 _mouseHotspotY; + // joystick + SDL_Joystick *_joystick; + // Shake mode int _currentShakePos; int _newShakePos; @@ -213,20 +215,21 @@ protected: void add_dirty_rgn_auto(const byte *buf); void mk_checksums(const byte *buf); - static void fill_sound(void *userdata, Uint8 * stream, int len); - void add_dirty_rect(int x, int y, int w, int h); virtual void draw_mouse(); virtual void undraw_mouse(); /** Set the position of the virtual mouse cursor. */ void set_mouse_pos(int x, int y); + void fillMouseEvent(Event &event, int x, int y); virtual void load_gfx_mode() = 0; virtual void unload_gfx_mode() = 0; virtual bool save_screenshot(const char *filename) = 0; + + virtual int effectiveScreenHeight() { return (_adjustAspectRatio ? 240 : _screenHeight) * _scaleFactor; } void setup_icon(); void kbd_mouse(); |