diff options
author | Max Horn | 2004-06-25 20:01:31 +0000 |
---|---|---|
committer | Max Horn | 2004-06-25 20:01:31 +0000 |
commit | bb3ef09efad34d8263f90cc76fd5de449bf5c722 (patch) | |
tree | 28cbef15401dd07c22adca40f04fc7f7dfaa416e /saga | |
parent | c399ca84860d55f85da13fe480c4ae06fd32f3a2 (diff) | |
download | scummvm-rg350-bb3ef09efad34d8263f90cc76fd5de449bf5c722.tar.gz scummvm-rg350-bb3ef09efad34d8263f90cc76fd5de449bf5c722.tar.bz2 scummvm-rg350-bb3ef09efad34d8263f90cc76fd5de449bf5c722.zip |
Removed unused stuff; cleanup
svn-id: r14052
Diffstat (limited to 'saga')
-rw-r--r-- | saga/gfx.cpp | 2 | ||||
-rw-r--r-- | saga/input.cpp | 32 | ||||
-rw-r--r-- | saga/reinherit.h | 15 | ||||
-rw-r--r-- | saga/render.cpp | 6 | ||||
-rw-r--r-- | saga/saga.cpp | 2 | ||||
-rw-r--r-- | saga/saga.h | 2 |
6 files changed, 10 insertions, 49 deletions
diff --git a/saga/gfx.cpp b/saga/gfx.cpp index 454e368b5e..1f75529b0f 100644 --- a/saga/gfx.cpp +++ b/saga/gfx.cpp @@ -68,7 +68,7 @@ int GFX_Init(OSystem *system, int width, int height) { // For now, always show the mouse cursor. GFX_SetCursor(1); - SYSINPUT_ShowMouse(); + g_system->showMouse(true); return R_SUCCESS; } diff --git a/saga/input.cpp b/saga/input.cpp index eac43741f3..62a897a630 100644 --- a/saga/input.cpp +++ b/saga/input.cpp @@ -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 @@ int SYSINPUT_ProcessInput() { 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 @@ int SYSINPUT_ProcessInput() { 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 diff --git a/saga/reinherit.h b/saga/reinherit.h index 896286e21d..af5c1b9bef 100644 --- a/saga/reinherit.h +++ b/saga/reinherit.h @@ -71,14 +71,6 @@ struct R_SURFACE { #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 @@ struct PALENTRY { }; enum R_ERRORCODE { - R_STOP = -3, R_MEM = -2, R_FAILURE = -1, R_SUCCESS = 0 @@ -102,7 +93,6 @@ int TRANSITION_Dissolve(byte *dst_img, int dst_w, int dst_h, #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_PalToBlack(R_SURFACE *surface, PALENTRY *src_pal, double percent); 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 diff --git a/saga/render.cpp b/saga/render.cpp index fa6cff7b4d..9c8fd3ac61 100644 --- a/saga/render.cpp +++ b/saga/render.cpp @@ -112,7 +112,6 @@ int RENDER_DrawScene() { 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 @@ int RENDER_DrawScene() { 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); diff --git a/saga/saga.cpp b/saga/saga.cpp index a850ece448..509fb85328 100644 --- a/saga/saga.cpp +++ b/saga/saga.cpp @@ -206,8 +206,6 @@ void SagaEngine::go() { debug(0, "Sound disabled."); } - SYSINPUT_Init(); - SYSTIMER_ResetMSCounter(); // Begin Main Engine Loop diff --git a/saga/saga.h b/saga/saga.h index f792e63c29..0e8a974e26 100644 --- a/saga/saga.h +++ b/saga/saga.h @@ -42,7 +42,7 @@ class SndRes; class Sound; class Music; -typedef Common::MemoryReadStream MemoryReadStream; +using Common::MemoryReadStream; #define R_PBOUNDS(n,max) (((n)>=(0))&&((n)<(max))) |