[Scummvm-cvs-logs] CVS: scummvm/saga gfx.cpp,1.16,1.17 input.cpp,1.2,1.3 reinherit.h,1.19,1.20 render.cpp,1.11,1.12 saga.cpp,1.20,1.21 saga.h,1.11,1.12

[Max Horn]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14295

Modified Files:
	gfx.cpp input.cpp reinherit.h render.cpp saga.cpp saga.h 
Log Message:
Removed unused stuff; cleanup

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gfx.cpp	5 Jun 2004 11:12:51 -0000	1.16
+++ gfx.cpp	25 Jun 2004 20:01:31 -0000	1.17
@@ -68,7 +68,7 @@
 
 	// For now, always show the mouse cursor.
 	GFX_SetCursor(1);
-	SYSINPUT_ShowMouse();
+	g_system->showMouse(true);
 
 	return R_SUCCESS;
 }

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/input.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.cpp	5 Jun 2004 11:12:51 -0000	1.2
+++ input.cpp	25 Jun 2004 20:01:31 -0000	1.3
@@ -32,11 +32,7 @@
 
 namespace Saga {
 
-static int _mouse_x, _mouse_y;
-
-int SYSINPUT_Init() {
-	return R_SUCCESS;
-}
+static R_POINT _mousePos;
 
 int SYSINPUT_ProcessInput() {
 	OSystem::Event event;
@@ -120,10 +116,9 @@
 			INTERFACE_Update(&imouse_pt, UPDATE_MOUSECLICK);
 			break;
 		case OSystem::EVENT_MOUSEMOVE:
-			_mouse_x = event.mouse.x;
-			_mouse_y = event.mouse.y;
-			imouse_pt.x = _mouse_x;
-			imouse_pt.y = _mouse_y;
+			_mousePos.x = event.mouse.x;
+			_mousePos.y = event.mouse.y;
+			imouse_pt = _mousePos;
 			break;
 		case OSystem::EVENT_QUIT:
 			g_system->quit();
@@ -136,23 +131,8 @@
 	return R_SUCCESS;
 }
 
-int SYSINPUT_GetMousePos(int *mouse_x, int *mouse_y) {
-	*mouse_x = _mouse_x;
-	*mouse_y = _mouse_y;
-
-	return R_SUCCESS;
-}
-
-int SYSINPUT_HideMouse() {
-	g_system->showMouse(false);
-
-	return R_SUCCESS;
-}
-
-int SYSINPUT_ShowMouse() {
-	g_system->showMouse(true);
-
-	return R_SUCCESS;
+R_POINT SYSINPUT_GetMousePos() {
+	return _mousePos;
 }
 
 } // End of namespace Saga

Index: reinherit.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/reinherit.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- reinherit.h	5 May 2004 13:05:30 -0000	1.19
+++ reinherit.h	25 Jun 2004 20:01:31 -0000	1.20
@@ -71,14 +71,6 @@
 #define R_RGB_GREEN 0x0000FF00UL
 #define R_RGB_BLUE  0x000000FFUL
 
-struct SAGA_COLOR {
-	byte r;
-	byte g;
-	byte b;
-};
-
-#define SAGA_COLOR_LEN 3
-
 struct PALENTRY {
 	byte red;
 	byte green;
@@ -86,7 +78,6 @@
 };
 
 enum R_ERRORCODE {
-	R_STOP = -3,
 	R_MEM = -2,
 	R_FAILURE = -1,
 	R_SUCCESS = 0
@@ -102,7 +93,6 @@
 #define R_PAL_ENTRIES 256
 
 int GFX_Init(OSystem *system, int width, int height);
-R_SURFACE *GFX_GetScreenSurface();
 R_SURFACE *GFX_GetBackBuffer();
 int GFX_GetWhite();
 int GFX_GetBlack();
@@ -113,11 +103,8 @@
 int GFX_BlackToPal(R_SURFACE *surface, PALENTRY *src_pal, double percent);
 
 // System : Input 
-int SYSINPUT_Init();
 int SYSINPUT_ProcessInput(void);
-int SYSINPUT_GetMousePos(int *mouse_x, int *mouse_y);
-int SYSINPUT_HideMouse(void);
-int SYSINPUT_ShowMouse(void);
+R_POINT SYSINPUT_GetMousePos();
 
 } // End of namespace Saga
 

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/render.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- render.cpp	2 May 2004 15:44:19 -0000	1.11
+++ render.cpp	25 Jun 2004 20:01:31 -0000	1.12
@@ -112,7 +112,6 @@
 	char txt_buf[20];
 	int fps_width;
 	R_POINT mouse_pt;
-	int mouse_x, mouse_y;
 
 	if (!RenderModule.initialized) {
 		return R_FAILURE;
@@ -123,10 +122,7 @@
 	backbuf_surface = RenderModule.r_backbuf_surface;
 
 	// Get mouse coordinates
-	SYSINPUT_GetMousePos(&mouse_x, &mouse_y);
-
-	mouse_pt.x = mouse_x;
-	mouse_pt.y = mouse_y;
+	mouse_pt = SYSINPUT_GetMousePos();
 
 	SCENE_GetBGInfo(&bg_info);
 	GAME_GetDisplayInfo(&disp_info);

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- saga.cpp	5 May 2004 13:05:30 -0000	1.20
+++ saga.cpp	25 Jun 2004 20:01:31 -0000	1.21
@@ -206,8 +206,6 @@
 		debug(0, "Sound disabled.");
 	}
 
-	SYSINPUT_Init();
-
 	SYSTIMER_ResetMSCounter();
 
 	// Begin Main Engine Loop

Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- saga.h	3 May 2004 23:06:57 -0000	1.11
+++ saga.h	25 Jun 2004 20:01:31 -0000	1.12
@@ -42,7 +42,7 @@
 class Sound;
 class Music;
 
-typedef Common::MemoryReadStream MemoryReadStream;
+using Common::MemoryReadStream;
 
 #define R_PBOUNDS(n,max) (((n)>=(0))&&((n)<(max)))