From daa8d57a866e2866369e432cf1d624179edc8875 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 27 May 2014 02:04:07 +0200 Subject: ALL: Rename Debugger::DebugPrintf to Debugger::debugPrintf. --- engines/voyeur/debugger.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'engines/voyeur/debugger.cpp') diff --git a/engines/voyeur/debugger.cpp b/engines/voyeur/debugger.cpp index 234300bce5..90b9255e9f 100644 --- a/engines/voyeur/debugger.cpp +++ b/engines/voyeur/debugger.cpp @@ -52,38 +52,38 @@ bool Debugger::Cmd_Time(int argc, const char **argv) { if (!timeString.empty()) dtString += " " + timeString; - DebugPrintf("Time period = %d, date/time is: %s, time is %s\n", + debugPrintf("Time period = %d, date/time is: %s, time is %s\n", _vm->_voy->_transitionId, dtString.c_str(), _isTimeActive ? "on" : "off"); - DebugPrintf("Format: %s [on | off | 1..17 | val ]\n\n", argv[0]); + debugPrintf("Format: %s [on | off | 1..17 | val ]\n\n", argv[0]); } else { if (!strcmp(argv[1], "on")) { _isTimeActive = true; - DebugPrintf("Time is now on\n\n"); + debugPrintf("Time is now on\n\n"); } else if (!strcmp(argv[1], "off")) { _isTimeActive = false; - DebugPrintf("Time is now off\n\n"); + debugPrintf("Time is now off\n\n"); } else if (!strcmp(argv[1], "val")) { if (argc < 3) { - DebugPrintf("Time expired is currently %d.\n", _vm->_voy->_RTVNum); + debugPrintf("Time expired is currently %d.\n", _vm->_voy->_RTVNum); } else { _vm->_voy->_RTVNum = atoi(argv[2]); - DebugPrintf("Time expired is now %d.\n", _vm->_voy->_RTVNum); + debugPrintf("Time expired is now %d.\n", _vm->_voy->_RTVNum); } } else { int timeId = atoi(argv[1]); if (timeId >= 1 && timeId < 17) { int stateId = TIME_STATES[timeId - 1]; if (!stateId) { - DebugPrintf("Given time period is not used in-game\n"); + debugPrintf("Given time period is not used in-game\n"); } else { - DebugPrintf("Changing to time period: %d\n", timeId); + debugPrintf("Changing to time period: %d\n", timeId); if (_vm->_mainThread->goToState(-1, stateId)) _vm->_mainThread->parsePlayCommands(); return false; } } else { - DebugPrintf("Unknown parameter\n\n"); + debugPrintf("Unknown parameter\n\n"); } } } @@ -93,7 +93,7 @@ bool Debugger::Cmd_Time(int argc, const char **argv) { bool Debugger::Cmd_Hotspots(int argc, const char **argv) { if (_vm->_voy->_computerTextId >= 0) { - DebugPrintf("Hotspot Computer Screen %d - %d,%d->%d,%d\n", + debugPrintf("Hotspot Computer Screen %d - %d,%d->%d,%d\n", _vm->_voy->_computerTextId, _vm->_voy->_computerScreenRect.left, _vm->_voy->_computerScreenRect.top, @@ -112,9 +112,9 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) { hotspots[hotspotIdx].right, hotspots[hotspotIdx].bottom); int arrIndex = hotspots[hotspotIdx]._arrIndex; if (_vm->_voy->_roomHotspotsEnabled[arrIndex - 1]) { - DebugPrintf("Hotspot Room %d - %s - Enabled\n", arrIndex, pos); + debugPrintf("Hotspot Room %d - %s - Enabled\n", arrIndex, pos); } else { - DebugPrintf("Hotspot Room - %s - Disabled\n", pos); + debugPrintf("Hotspot Room - %s - Disabled\n", pos); } } } @@ -132,14 +132,14 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) { for (int arrIndex = 0; arrIndex < 3; ++arrIndex) { if (_vm->_voy->_audioHotspotTimes._min[arrIndex][hotspotIdx] != 9999) { - DebugPrintf("Hotspot %d %s Audio slot %d, time: %d to %d\n", + debugPrintf("Hotspot %d %s Audio slot %d, time: %d to %d\n", hotspotIdx, pos.c_str(), arrIndex, _vm->_voy->_audioHotspotTimes._min[arrIndex][hotspotIdx], _vm->_voy->_audioHotspotTimes._max[arrIndex][hotspotIdx]); } if (_vm->_voy->_evidenceHotspotTimes._min[arrIndex][hotspotIdx] != 9999) { - DebugPrintf("Hotspot %d %s Evidence slot %d, time: %d to %d\n", + debugPrintf("Hotspot %d %s Evidence slot %d, time: %d to %d\n", hotspotIdx, pos.c_str(), arrIndex, _vm->_voy->_evidenceHotspotTimes._min[arrIndex][hotspotIdx], _vm->_voy->_evidenceHotspotTimes._max[arrIndex][hotspotIdx]); @@ -148,7 +148,7 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) { for (int arrIndex = 0; arrIndex < 8; ++arrIndex) { if (_vm->_voy->_videoHotspotTimes._min[arrIndex][hotspotIdx] != 9999) { - DebugPrintf("Hotspot %d %s Video slot %d, time: %d to %d\n", + debugPrintf("Hotspot %d %s Video slot %d, time: %d to %d\n", hotspotIdx, pos.c_str(), arrIndex, _vm->_voy->_videoHotspotTimes._min[arrIndex][hotspotIdx], _vm->_voy->_videoHotspotTimes._max[arrIndex][hotspotIdx]); @@ -157,16 +157,16 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) { } } - DebugPrintf("\nEnd of list\n"); + debugPrintf("\nEnd of list\n"); return true; } bool Debugger::Cmd_Mouse(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("mouse [ on | off ]\n"); + debugPrintf("mouse [ on | off ]\n"); } else { _showMousePosition = !strcmp(argv[1], "on"); - DebugPrintf("Mouse position is now %s\n", _showMousePosition ? "on" : "off"); + debugPrintf("Mouse position is now %s\n", _showMousePosition ? "on" : "off"); } return true; -- cgit v1.2.3 From ae4ffe01f0e4354938714c546034cd0f9806bfc3 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 27 May 2014 02:04:08 +0200 Subject: ALL: Rename Debugger::DCmd_Register to Debugger::registerCmd. --- engines/voyeur/debugger.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/voyeur/debugger.cpp') diff --git a/engines/voyeur/debugger.cpp b/engines/voyeur/debugger.cpp index 90b9255e9f..71a0e7e853 100644 --- a/engines/voyeur/debugger.cpp +++ b/engines/voyeur/debugger.cpp @@ -29,11 +29,11 @@ namespace Voyeur { Debugger::Debugger(VoyeurEngine *vm) : GUI::Debugger(), _vm(vm) { // Register methods - DCmd_Register("continue", WRAP_METHOD(Debugger, Cmd_Exit)); - DCmd_Register("exit", WRAP_METHOD(Debugger, Cmd_Exit)); - DCmd_Register("time", WRAP_METHOD(Debugger, Cmd_Time)); - DCmd_Register("hotspots", WRAP_METHOD(Debugger, Cmd_Hotspots)); - DCmd_Register("mouse", WRAP_METHOD(Debugger, Cmd_Mouse)); + registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); + registerCmd("exit", WRAP_METHOD(Debugger, Cmd_Exit)); + registerCmd("time", WRAP_METHOD(Debugger, Cmd_Time)); + registerCmd("hotspots", WRAP_METHOD(Debugger, Cmd_Hotspots)); + registerCmd("mouse", WRAP_METHOD(Debugger, Cmd_Mouse)); // Set fields _isTimeActive = true; -- cgit v1.2.3 From 30d64edac449cde1f1c387b817ec33446ddd4698 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 27 May 2014 02:04:08 +0200 Subject: ALL: Make Debugger command function names conform to our guidelines. --- engines/voyeur/debugger.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/voyeur/debugger.cpp') diff --git a/engines/voyeur/debugger.cpp b/engines/voyeur/debugger.cpp index 71a0e7e853..afa24078fd 100644 --- a/engines/voyeur/debugger.cpp +++ b/engines/voyeur/debugger.cpp @@ -29,8 +29,8 @@ namespace Voyeur { Debugger::Debugger(VoyeurEngine *vm) : GUI::Debugger(), _vm(vm) { // Register methods - registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); - registerCmd("exit", WRAP_METHOD(Debugger, Cmd_Exit)); + registerCmd("continue", WRAP_METHOD(Debugger, cmdExit)); + registerCmd("exit", WRAP_METHOD(Debugger, cmdExit)); registerCmd("time", WRAP_METHOD(Debugger, Cmd_Time)); registerCmd("hotspots", WRAP_METHOD(Debugger, Cmd_Hotspots)); registerCmd("mouse", WRAP_METHOD(Debugger, Cmd_Mouse)); -- cgit v1.2.3 From 3dccfda1cf681d621ed65e998e364a3678a9b89f Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 27 May 2014 02:04:08 +0200 Subject: VOYEUR: Don't overwrite "exit" command in the debugger. It actually overwrite "exit" by cmdExit and thus effectively the same command... --- engines/voyeur/debugger.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'engines/voyeur/debugger.cpp') diff --git a/engines/voyeur/debugger.cpp b/engines/voyeur/debugger.cpp index afa24078fd..bd1da3ee0a 100644 --- a/engines/voyeur/debugger.cpp +++ b/engines/voyeur/debugger.cpp @@ -30,7 +30,6 @@ namespace Voyeur { Debugger::Debugger(VoyeurEngine *vm) : GUI::Debugger(), _vm(vm) { // Register methods registerCmd("continue", WRAP_METHOD(Debugger, cmdExit)); - registerCmd("exit", WRAP_METHOD(Debugger, cmdExit)); registerCmd("time", WRAP_METHOD(Debugger, Cmd_Time)); registerCmd("hotspots", WRAP_METHOD(Debugger, Cmd_Hotspots)); registerCmd("mouse", WRAP_METHOD(Debugger, Cmd_Mouse)); -- cgit v1.2.3 From fc250701c59f8fa1b606dc410046eb2758657e63 Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Wed, 28 May 2014 23:30:29 +0200 Subject: VOYEUR: Janitorial - Remove trailing whitespace --- engines/voyeur/debugger.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/voyeur/debugger.cpp') diff --git a/engines/voyeur/debugger.cpp b/engines/voyeur/debugger.cpp index bd1da3ee0a..e9a12180da 100644 --- a/engines/voyeur/debugger.cpp +++ b/engines/voyeur/debugger.cpp @@ -45,13 +45,13 @@ static const int TIME_STATES[] = { bool Debugger::Cmd_Time(int argc, const char **argv) { if (argc < 2) { - // Get the current day and time of day + // Get the current day and time of day Common::String dtString = _vm->getDayName(); Common::String timeString = _vm->getTimeOfDay(); if (!timeString.empty()) dtString += " " + timeString; - debugPrintf("Time period = %d, date/time is: %s, time is %s\n", + debugPrintf("Time period = %d, date/time is: %s, time is %s\n", _vm->_voy->_transitionId, dtString.c_str(), _isTimeActive ? "on" : "off"); debugPrintf("Format: %s [on | off | 1..17 | val ]\n\n", argv[0]); } else { @@ -131,14 +131,14 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) { for (int arrIndex = 0; arrIndex < 3; ++arrIndex) { if (_vm->_voy->_audioHotspotTimes._min[arrIndex][hotspotIdx] != 9999) { - debugPrintf("Hotspot %d %s Audio slot %d, time: %d to %d\n", + debugPrintf("Hotspot %d %s Audio slot %d, time: %d to %d\n", hotspotIdx, pos.c_str(), arrIndex, _vm->_voy->_audioHotspotTimes._min[arrIndex][hotspotIdx], _vm->_voy->_audioHotspotTimes._max[arrIndex][hotspotIdx]); } if (_vm->_voy->_evidenceHotspotTimes._min[arrIndex][hotspotIdx] != 9999) { - debugPrintf("Hotspot %d %s Evidence slot %d, time: %d to %d\n", + debugPrintf("Hotspot %d %s Evidence slot %d, time: %d to %d\n", hotspotIdx, pos.c_str(), arrIndex, _vm->_voy->_evidenceHotspotTimes._min[arrIndex][hotspotIdx], _vm->_voy->_evidenceHotspotTimes._max[arrIndex][hotspotIdx]); @@ -147,7 +147,7 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) { for (int arrIndex = 0; arrIndex < 8; ++arrIndex) { if (_vm->_voy->_videoHotspotTimes._min[arrIndex][hotspotIdx] != 9999) { - debugPrintf("Hotspot %d %s Video slot %d, time: %d to %d\n", + debugPrintf("Hotspot %d %s Video slot %d, time: %d to %d\n", hotspotIdx, pos.c_str(), arrIndex, _vm->_voy->_videoHotspotTimes._min[arrIndex][hotspotIdx], _vm->_voy->_videoHotspotTimes._max[arrIndex][hotspotIdx]); -- cgit v1.2.3