diff options
| -rw-r--r-- | engines/sci/console.cpp | 10 | ||||
| -rw-r--r-- | engines/scumm/debugger.cpp | 8 | ||||
| -rw-r--r-- | gui/debugger.cpp | 4 | ||||
| -rw-r--r-- | gui/debugger.h | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 4f7aed75ac..b02429c2a1 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -79,11 +79,11 @@ Console::Console(SciEngine *engine) : GUI::Debugger(), assert(_engine->_gamestate); // Variables - DVar_Register("sleeptime_factor", &g_debug_sleeptime_factor, DVAR_INT, 0); - DVar_Register("gc_interval", &engine->_gamestate->scriptGCInterval, DVAR_INT, 0); - DVar_Register("simulated_key", &g_debug_simulated_key, DVAR_INT, 0); - DVar_Register("track_mouse_clicks", &g_debug_track_mouse_clicks, DVAR_BOOL, 0); - DVar_Register("script_abort_flag", &_engine->_gamestate->abortScriptProcessing, DVAR_INT, 0); + registerVar("sleeptime_factor", &g_debug_sleeptime_factor, DVAR_INT, 0); + registerVar("gc_interval", &engine->_gamestate->scriptGCInterval, DVAR_INT, 0); + registerVar("simulated_key", &g_debug_simulated_key, DVAR_INT, 0); + registerVar("track_mouse_clicks", &g_debug_track_mouse_clicks, DVAR_BOOL, 0); + registerVar("script_abort_flag", &_engine->_gamestate->abortScriptProcessing, DVAR_INT, 0); // General DCmd_Register("help", WRAP_METHOD(Console, cmdHelp)); diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp index 665609bf32..01535bf60a 100644 --- a/engines/scumm/debugger.cpp +++ b/engines/scumm/debugger.cpp @@ -58,10 +58,10 @@ ScummDebugger::ScummDebugger(ScummEngine *s) _vm = s; // Register variables - DVar_Register("scumm_speed", &_vm->_fastMode, DVAR_BYTE, 0); - DVar_Register("scumm_room", &_vm->_currentRoom, DVAR_BYTE, 0); - DVar_Register("scumm_roomresource", &_vm->_roomResource, DVAR_INT, 0); - DVar_Register("scumm_vars", &_vm->_scummVars, DVAR_INTARRAY, _vm->_numVariables); + registerVar("scumm_speed", &_vm->_fastMode, DVAR_BYTE, 0); + registerVar("scumm_room", &_vm->_currentRoom, DVAR_BYTE, 0); + registerVar("scumm_roomresource", &_vm->_roomResource, DVAR_INT, 0); + registerVar("scumm_vars", &_vm->_scummVars, DVAR_INTARRAY, _vm->_numVariables); // Register commands DCmd_Register("continue", WRAP_METHOD(ScummDebugger, Cmd_Exit)); diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 498f19df5f..1d74db30cc 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -52,7 +52,7 @@ Debugger::Debugger() { #endif // Register variables - DVar_Register("debug_countdown", &_frameCountdown, DVAR_INT, 0); + registerVar("debug_countdown", &_frameCountdown, DVAR_INT, 0); // Register commands //DCmd_Register("continue", WRAP_METHOD(Debugger, Cmd_Exit)); @@ -406,7 +406,7 @@ char *Debugger::readlineComplete(const char *input, int state) { #endif // Variable registration function -void Debugger::DVar_Register(const Common::String &varname, void *pointer, VarType type, int arraySize) { +void Debugger::registerVar(const Common::String &varname, void *pointer, VarType type, int arraySize) { // TODO: Filter out duplicates // TODO: Sort this list? Then we can do binary search later on when doing lookups. assert(pointer); diff --git a/gui/debugger.h b/gui/debugger.h index a2a7aa2d86..6ccc77b129 100644 --- a/gui/debugger.h +++ b/gui/debugger.h @@ -107,7 +107,7 @@ protected: * * @todo replace this single method by type safe variants. */ - void DVar_Register(const Common::String &varname, void *variable, VarType type, int arraySize); + void registerVar(const Common::String &varname, void *variable, VarType type, int arraySize); void DCmd_Register(const Common::String &cmdname, Debuglet *debuglet); |