From 0765b272aef169411df8fc1a17d4a5f28f76bf8a Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 1 May 2004 23:46:23 +0000 Subject: Renamed files for consistency svn-id: r13725 --- saga/input.cpp | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ saga/module.mk | 4 +- saga/render.cpp | 2 +- saga/saga.cpp | 2 +- saga/sysinput.cpp | 159 ------------------------------------------------------ saga/systimer.cpp | 139 ----------------------------------------------- saga/systimer.h | 43 --------------- saga/timer.cpp | 139 +++++++++++++++++++++++++++++++++++++++++++++++ saga/timer.h | 43 +++++++++++++++ 9 files changed, 345 insertions(+), 345 deletions(-) create mode 100644 saga/input.cpp delete mode 100644 saga/sysinput.cpp delete mode 100644 saga/systimer.cpp delete mode 100644 saga/systimer.h create mode 100644 saga/timer.cpp create mode 100644 saga/timer.h (limited to 'saga') diff --git a/saga/input.cpp b/saga/input.cpp new file mode 100644 index 0000000000..b6f4f97f46 --- /dev/null +++ b/saga/input.cpp @@ -0,0 +1,159 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2004 The ScummVM project + * + * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Header$ + * + */ +#include "saga.h" +#include "reinherit.h" + +#include "actor_mod.h" +#include "console_mod.h" +#include "interface_mod.h" +#include "render_mod.h" +#include "scene_mod.h" +#include "script_mod.h" + +namespace Saga { + +static int _mouse_x, _mouse_y; + +int SYSINPUT_Init() { + return R_SUCCESS; +} + +int SYSINPUT_ProcessInput() { + OSystem::Event event; + + R_POINT imouse_pt; + + while (g_system->poll_event(&event)) { + int in_char; + + switch (event.event_code) { + case OSystem::EVENT_KEYDOWN: + if (CON_IsActive()) { + in_char = event.kbd.ascii; + switch (event.kbd.keycode) { + case 96: // backquote + CON_Deactivate(); + break; + case 280: // page up + CON_PageUp(); + break; + case 281: // page down + CON_PageDown(); + break; + case 273: // up + case 264: // keypad up + CON_CmdUp(); + break; + case 274: // down + case 258: // keypad down + CON_CmdDown(); + break; + default: + if (in_char) { + CON_Type(in_char); + } + break; + } + break; + } + + switch (event.kbd.keycode) { + case 96: // back quote + CON_Activate(); + break; + case 114: // r + INTERFACE_Draw(); + break; + case 282: // F1 + RENDER_ToggleFlag(RF_SHOW_FPS); + break; + case 283: // F2 + RENDER_ToggleFlag(RF_PALETTE_TEST); + break; + case 284: // F3 + RENDER_ToggleFlag(RF_TEXT_TEST); + break; + case 285: // F4 + RENDER_ToggleFlag(RF_OBJECTMAP_TEST); + break; + case 9: // Tab + STHREAD_DebugStep(); + break; + + // Actual game keys + case 32: // space + ACTOR_SkipDialogue(); + break; + case 19: // pause + case 112: // p + RENDER_ToggleFlag(RF_RENDERPAUSE); + break; + case 27: // Esc + // Skip to next scene skip target + SCENE_Skip(); + break; + default: + break; + } + break; + case OSystem::EVENT_LBUTTONDOWN: + 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; + break; + case OSystem::EVENT_QUIT: + g_system->quit(); + break; + default: + break; + } + } + + 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; +} + +} // End of namespace Saga + diff --git a/saga/module.mk b/saga/module.mk index aa28d27727..7fde955894 100644 --- a/saga/module.mk +++ b/saga/module.mk @@ -39,8 +39,8 @@ MODULE_OBJS = \ saga/ys_binwrite.o \ saga/ys_dl_list.o \ saga/sysgfx.o \ - saga/sysinput.o \ - saga/systimer.o \ + saga/input.o \ + saga/timer.o \ saga/music.o \ saga/sound.o diff --git a/saga/render.cpp b/saga/render.cpp index 6cc49f9b4f..50cfd0f652 100644 --- a/saga/render.cpp +++ b/saga/render.cpp @@ -25,7 +25,7 @@ #include "saga.h" #include "reinherit.h" -#include "systimer.h" +#include "timer.h" #include "yslib.h" #include "actor_mod.h" diff --git a/saga/saga.cpp b/saga/saga.cpp index e8660e88ec..c8a360506b 100644 --- a/saga/saga.cpp +++ b/saga/saga.cpp @@ -34,7 +34,7 @@ #include "reinherit.h" -#include "systimer.h" +#include "timer.h" #include "rscfile_mod.h" #include "render_mod.h" diff --git a/saga/sysinput.cpp b/saga/sysinput.cpp deleted file mode 100644 index b6f4f97f46..0000000000 --- a/saga/sysinput.cpp +++ /dev/null @@ -1,159 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 The ScummVM project - * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Header$ - * - */ -#include "saga.h" -#include "reinherit.h" - -#include "actor_mod.h" -#include "console_mod.h" -#include "interface_mod.h" -#include "render_mod.h" -#include "scene_mod.h" -#include "script_mod.h" - -namespace Saga { - -static int _mouse_x, _mouse_y; - -int SYSINPUT_Init() { - return R_SUCCESS; -} - -int SYSINPUT_ProcessInput() { - OSystem::Event event; - - R_POINT imouse_pt; - - while (g_system->poll_event(&event)) { - int in_char; - - switch (event.event_code) { - case OSystem::EVENT_KEYDOWN: - if (CON_IsActive()) { - in_char = event.kbd.ascii; - switch (event.kbd.keycode) { - case 96: // backquote - CON_Deactivate(); - break; - case 280: // page up - CON_PageUp(); - break; - case 281: // page down - CON_PageDown(); - break; - case 273: // up - case 264: // keypad up - CON_CmdUp(); - break; - case 274: // down - case 258: // keypad down - CON_CmdDown(); - break; - default: - if (in_char) { - CON_Type(in_char); - } - break; - } - break; - } - - switch (event.kbd.keycode) { - case 96: // back quote - CON_Activate(); - break; - case 114: // r - INTERFACE_Draw(); - break; - case 282: // F1 - RENDER_ToggleFlag(RF_SHOW_FPS); - break; - case 283: // F2 - RENDER_ToggleFlag(RF_PALETTE_TEST); - break; - case 284: // F3 - RENDER_ToggleFlag(RF_TEXT_TEST); - break; - case 285: // F4 - RENDER_ToggleFlag(RF_OBJECTMAP_TEST); - break; - case 9: // Tab - STHREAD_DebugStep(); - break; - - // Actual game keys - case 32: // space - ACTOR_SkipDialogue(); - break; - case 19: // pause - case 112: // p - RENDER_ToggleFlag(RF_RENDERPAUSE); - break; - case 27: // Esc - // Skip to next scene skip target - SCENE_Skip(); - break; - default: - break; - } - break; - case OSystem::EVENT_LBUTTONDOWN: - 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; - break; - case OSystem::EVENT_QUIT: - g_system->quit(); - break; - default: - break; - } - } - - 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; -} - -} // End of namespace Saga - diff --git a/saga/systimer.cpp b/saga/systimer.cpp deleted file mode 100644 index 65cc2545e8..0000000000 --- a/saga/systimer.cpp +++ /dev/null @@ -1,139 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 The ScummVM project - * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Header$ - * - */ - -#include "reinherit.h" - -#include - -#include "systimer.h" - -namespace Saga { - -struct R_SYSTIMER { - int t_running; - unsigned long t_interval; - void *t_param; - R_SYSTIMER_CALLBACK t_callback_f; - SDL_TimerID t_sdl_timerid; -}; - -struct R_SYSTIMER_DATA { - int initialized; - uint32 t_start_ticks; - uint32 t_current_ticks; - uint32 t_previous_ticks; -}; - -static R_SYSTIMER_DATA R_TimerData; - -static Uint32 SYSTIMER_Callback(Uint32 interval, void *param); - -int SYSTIMER_InitMSCounter() { - if (R_TimerData.initialized) { - return R_FAILURE; - } - - R_TimerData.t_previous_ticks = SDL_GetTicks(); - R_TimerData.initialized = 1; - - return R_SUCCESS; -} - -unsigned long SYSTIMER_ReadMSCounter() { - Uint32 ms_elapsed = 0; - - if (!R_TimerData.initialized) { - return 0; - } - - R_TimerData.t_current_ticks = SDL_GetTicks(); - - if (R_TimerData.t_current_ticks < R_TimerData.t_previous_ticks) { - // Timer has rolled over after 49 days - } else { - ms_elapsed = R_TimerData.t_current_ticks - R_TimerData.t_previous_ticks; - R_TimerData.t_previous_ticks = R_TimerData.t_current_ticks; - } - - return ms_elapsed; -} - -int SYSTIMER_ResetMSCounter() { - if (!R_TimerData.initialized) { - return R_FAILURE; - } - - R_TimerData.t_previous_ticks = SDL_GetTicks(); - - return R_SUCCESS; -} - -int SYSTIMER_Sleep(uint16 msec) { - SDL_Delay(msec); - - return R_SUCCESS; -} - -int SYSTIMER_CreateTimer(R_SYSTIMER **timer, unsigned long interval, void *param, R_SYSTIMER_CALLBACK callback) { - R_SYSTIMER *new_timer = (R_SYSTIMER *)malloc(sizeof *new_timer); - if (new_timer == NULL) { - return R_MEM; - } - - new_timer->t_interval = interval; - new_timer->t_param = param; - new_timer->t_callback_f = callback; - - *timer = new_timer; - - new_timer->t_sdl_timerid = SDL_AddTimer(interval, SYSTIMER_Callback, new_timer); - - if (new_timer->t_sdl_timerid == NULL) { - free(new_timer); - *timer = NULL; - return R_FAILURE; - } - - return R_SUCCESS; -} - -int SYSTIMER_DestroyTimer(R_SYSTIMER *timer) { - if (timer == NULL) { - return R_FAILURE; - } - - timer->t_running = 0; - SDL_RemoveTimer(timer->t_sdl_timerid); - free(timer); - - return R_SUCCESS; -} - -Uint32 SYSTIMER_Callback(Uint32 interval, void *param) { - R_SYSTIMER *timer_p = (R_SYSTIMER *)param; - timer_p->t_callback_f(timer_p->t_interval, timer_p->t_param); - - return timer_p->t_interval; -} - -} // End of namespace Saga diff --git a/saga/systimer.h b/saga/systimer.h deleted file mode 100644 index 5861ba7463..0000000000 --- a/saga/systimer.h +++ /dev/null @@ -1,43 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004 The ScummVM project - * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Header$ - * - */ -#ifndef SAGA_SYSTIMER_H__ -#define SAGA_SYSTIMER_H__ - -namespace Saga { - -typedef void (*R_SYSTIMER_CALLBACK) (unsigned long, void *); - -struct R_SYSTIMER; - -int SYSTIMER_InitMSCounter(); -unsigned long SYSTIMER_ReadMSCounter(); -int SYSTIMER_ResetMSCounter(); -int SYSTIMER_Sleep(uint16 msec); -int SYSTIMER_CreateTimer(R_SYSTIMER **, -unsigned long, void *, R_SYSTIMER_CALLBACK); -int SYSTIMER_DestroyTimer(R_SYSTIMER *); - - -} // End of namespace Saga - -#endif diff --git a/saga/timer.cpp b/saga/timer.cpp new file mode 100644 index 0000000000..a79d42f241 --- /dev/null +++ b/saga/timer.cpp @@ -0,0 +1,139 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2004 The ScummVM project + * + * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Header$ + * + */ + +#include "reinherit.h" + +#include + +#include "timer.h" + +namespace Saga { + +struct R_SYSTIMER { + int t_running; + unsigned long t_interval; + void *t_param; + R_SYSTIMER_CALLBACK t_callback_f; + SDL_TimerID t_sdl_timerid; +}; + +struct R_SYSTIMER_DATA { + int initialized; + uint32 t_start_ticks; + uint32 t_current_ticks; + uint32 t_previous_ticks; +}; + +static R_SYSTIMER_DATA R_TimerData; + +static Uint32 SYSTIMER_Callback(Uint32 interval, void *param); + +int SYSTIMER_InitMSCounter() { + if (R_TimerData.initialized) { + return R_FAILURE; + } + + R_TimerData.t_previous_ticks = SDL_GetTicks(); + R_TimerData.initialized = 1; + + return R_SUCCESS; +} + +unsigned long SYSTIMER_ReadMSCounter() { + Uint32 ms_elapsed = 0; + + if (!R_TimerData.initialized) { + return 0; + } + + R_TimerData.t_current_ticks = SDL_GetTicks(); + + if (R_TimerData.t_current_ticks < R_TimerData.t_previous_ticks) { + // Timer has rolled over after 49 days + } else { + ms_elapsed = R_TimerData.t_current_ticks - R_TimerData.t_previous_ticks; + R_TimerData.t_previous_ticks = R_TimerData.t_current_ticks; + } + + return ms_elapsed; +} + +int SYSTIMER_ResetMSCounter() { + if (!R_TimerData.initialized) { + return R_FAILURE; + } + + R_TimerData.t_previous_ticks = SDL_GetTicks(); + + return R_SUCCESS; +} + +int SYSTIMER_Sleep(uint16 msec) { + SDL_Delay(msec); + + return R_SUCCESS; +} + +int SYSTIMER_CreateTimer(R_SYSTIMER **timer, unsigned long interval, void *param, R_SYSTIMER_CALLBACK callback) { + R_SYSTIMER *new_timer = (R_SYSTIMER *)malloc(sizeof *new_timer); + if (new_timer == NULL) { + return R_MEM; + } + + new_timer->t_interval = interval; + new_timer->t_param = param; + new_timer->t_callback_f = callback; + + *timer = new_timer; + + new_timer->t_sdl_timerid = SDL_AddTimer(interval, SYSTIMER_Callback, new_timer); + + if (new_timer->t_sdl_timerid == NULL) { + free(new_timer); + *timer = NULL; + return R_FAILURE; + } + + return R_SUCCESS; +} + +int SYSTIMER_DestroyTimer(R_SYSTIMER *timer) { + if (timer == NULL) { + return R_FAILURE; + } + + timer->t_running = 0; + SDL_RemoveTimer(timer->t_sdl_timerid); + free(timer); + + return R_SUCCESS; +} + +Uint32 SYSTIMER_Callback(Uint32 interval, void *param) { + R_SYSTIMER *timer_p = (R_SYSTIMER *)param; + timer_p->t_callback_f(timer_p->t_interval, timer_p->t_param); + + return timer_p->t_interval; +} + +} // End of namespace Saga diff --git a/saga/timer.h b/saga/timer.h new file mode 100644 index 0000000000..5861ba7463 --- /dev/null +++ b/saga/timer.h @@ -0,0 +1,43 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2004 The ScummVM project + * + * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Header$ + * + */ +#ifndef SAGA_SYSTIMER_H__ +#define SAGA_SYSTIMER_H__ + +namespace Saga { + +typedef void (*R_SYSTIMER_CALLBACK) (unsigned long, void *); + +struct R_SYSTIMER; + +int SYSTIMER_InitMSCounter(); +unsigned long SYSTIMER_ReadMSCounter(); +int SYSTIMER_ResetMSCounter(); +int SYSTIMER_Sleep(uint16 msec); +int SYSTIMER_CreateTimer(R_SYSTIMER **, +unsigned long, void *, R_SYSTIMER_CALLBACK); +int SYSTIMER_DestroyTimer(R_SYSTIMER *); + + +} // End of namespace Saga + +#endif -- cgit v1.2.3