From 4a84b356f8570fd47ee258c694b7acd722eabe5f Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 4 Oct 2003 23:49:04 +0000
Subject: revert the 'reverse Y axis' hack

svn-id: r10594
---
 backends/sdl/sdl-common.cpp | 7 -------
 backends/sdl/sdl-common.h   | 3 +--
 backends/sdl/sdl_gl.cpp     | 4 ----
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp
index ee28922e7e..71ba2d07fc 100644
--- a/backends/sdl/sdl-common.cpp
+++ b/backends/sdl/sdl-common.cpp
@@ -564,13 +564,6 @@ void OSystem_SDL_Common::fillMouseEvent(Event &event, int x, int y) {
 	event.mouse.x = x;
 	event.mouse.y = y;
 	
-	// FIXME: HACK HACK HACK. This works around an odd problem in the OpenGL
-	// variant of the SDL backend, where the mouse y coordinates are reversed.
-	// Since the OpenGL variants is quite hackish anyway, we have to hard code
-	// here a screen height of 480).
-	if (_mode_flags & DF_REVERSE_Y)
-		event.mouse.y = 480 - event.mouse.y;
-	
 	// Update the "keyboard mouse" coords
 	km.x = event.mouse.x;
 	km.y = event.mouse.y;
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h
index 77d8b0384d..9c60626be7 100644
--- a/backends/sdl/sdl-common.h
+++ b/backends/sdl/sdl-common.h
@@ -145,8 +145,7 @@ protected:
 
 	enum {
 		DF_WANT_RECT_OPTIM			= 1 << 0,
-		DF_UPDATE_EXPAND_1_PIXEL	= 1 << 1,
-		DF_REVERSE_Y				= 1 << 2
+		DF_UPDATE_EXPAND_1_PIXEL	= 1 << 1
 	};
 
 	bool _forceFull; // Force full redraw on next update_screen
diff --git a/backends/sdl/sdl_gl.cpp b/backends/sdl/sdl_gl.cpp
index 7177a9ceeb..7161158d46 100644
--- a/backends/sdl/sdl_gl.cpp
+++ b/backends/sdl/sdl_gl.cpp
@@ -102,7 +102,6 @@ void OSystem_SDL_OpenGL::load_gfx_mode() {
 	switch(_mode) {
 	case GFX_BILINEAR:
 		_usingOpenGL = true;
-		_mode_flags |= DF_REVERSE_Y;
 		_mode = GFX_NORMAL;
 		break;
 
@@ -162,7 +161,6 @@ void OSystem_SDL_OpenGL::load_gfx_mode() {
 	
 	if (_mode != GFX_NORMAL) {
 		_usingOpenGL = false;
-		_mode_flags &= ~DF_REVERSE_Y;
 	}
 
 	//
@@ -642,7 +640,6 @@ uint32 OSystem_SDL_OpenGL::property(int param, Property *value) {
 			if (!_usingOpenGL) {
 				_usingOpenGL = true;
 				_mode = GFX_NORMAL;
-				_mode_flags |= DF_REVERSE_Y;
 				_scaleFactor = 1;
 				_scaler_proc = Normal1x;
 				hotswap_gfx_mode();
@@ -663,7 +660,6 @@ uint32 OSystem_SDL_OpenGL::property(int param, Property *value) {
 				if (_usingOpenGL) {
 					_glBilinearFilter = false;
 					_usingOpenGL = false;
-					_mode_flags &= ~DF_REVERSE_Y;
 				}
 				
 				hotswap_gfx_mode();
-- 
cgit v1.2.3