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/mohawk/console.cpp | 156 ++++++++++++++++++++++----------------------- 1 file changed, 78 insertions(+), 78 deletions(-) (limited to 'engines/mohawk') diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp index d95c91e3be..ec0b5a0ab2 100644 --- a/engines/mohawk/console.cpp +++ b/engines/mohawk/console.cpp @@ -70,7 +70,7 @@ MystConsole::~MystConsole() { bool MystConsole::Cmd_ChangeCard(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Usage: changeCard \n"); + debugPrintf("Usage: changeCard \n"); return true; } @@ -81,20 +81,20 @@ bool MystConsole::Cmd_ChangeCard(int argc, const char **argv) { } bool MystConsole::Cmd_CurCard(int argc, const char **argv) { - DebugPrintf("Current Card: %d\n", _vm->getCurCard()); + debugPrintf("Current Card: %d\n", _vm->getCurCard()); return true; } bool MystConsole::Cmd_Var(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("Usage: var ()\n"); + debugPrintf("Usage: var ()\n"); return true; } if (argc > 2) _vm->_scriptParser->setVarValue((uint16)atoi(argv[1]), (uint16)atoi(argv[2])); - DebugPrintf("%d = %d\n", (uint16)atoi(argv[1]), _vm->_scriptParser->getVar((uint16)atoi(argv[1]))); + debugPrintf("%d = %d\n", (uint16)atoi(argv[1]), _vm->_scriptParser->getVar((uint16)atoi(argv[1]))); return true; } @@ -130,19 +130,19 @@ static const uint16 default_start_card[12] = { }; bool MystConsole::Cmd_CurStack(int argc, const char **argv) { - DebugPrintf("Current Stack: %s\n", mystStackNames[_vm->getCurStack()]); + debugPrintf("Current Stack: %s\n", mystStackNames[_vm->getCurStack()]); return true; } bool MystConsole::Cmd_ChangeStack(int argc, const char **argv) { if (argc != 2 && argc != 3) { - DebugPrintf("Usage: changeStack []\n\n"); - DebugPrintf("Stacks:\n=======\n"); + debugPrintf("Usage: changeStack []\n\n"); + debugPrintf("Stacks:\n=======\n"); for (byte i = 0; i < ARRAYSIZE(mystStackNames); i++) - DebugPrintf(" %s\n", mystStackNames[i]); + debugPrintf(" %s\n", mystStackNames[i]); - DebugPrintf("\n"); + debugPrintf("\n"); return true; } @@ -156,7 +156,7 @@ bool MystConsole::Cmd_ChangeStack(int argc, const char **argv) { } if (!stackNum) { - DebugPrintf("\'%s\' is not a stack name!\n", argv[1]); + debugPrintf("\'%s\' is not a stack name!\n", argv[1]); return true; } @@ -177,7 +177,7 @@ bool MystConsole::Cmd_ChangeStack(int argc, const char **argv) { bool MystConsole::Cmd_DrawImage(int argc, const char **argv) { if (argc != 2 && argc != 6) { - DebugPrintf("Usage: drawImage [ ]\n"); + debugPrintf("Usage: drawImage [ ]\n"); return true; } @@ -195,8 +195,8 @@ bool MystConsole::Cmd_DrawImage(int argc, const char **argv) { bool MystConsole::Cmd_DrawRect(int argc, const char **argv) { if (argc != 5 && argc != 2) { - DebugPrintf("Usage: drawRect \n"); - DebugPrintf("Usage: drawRect \n"); + debugPrintf("Usage: drawRect \n"); + debugPrintf("Usage: drawRect \n"); return true; } @@ -213,7 +213,7 @@ bool MystConsole::Cmd_DrawRect(int argc, const char **argv) { bool MystConsole::Cmd_SetResourceEnable(int argc, const char **argv) { if (argc < 3) { - DebugPrintf("Usage: setResourceEnable \n"); + debugPrintf("Usage: setResourceEnable \n"); return true; } @@ -223,7 +223,7 @@ bool MystConsole::Cmd_SetResourceEnable(int argc, const char **argv) { bool MystConsole::Cmd_PlaySound(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("Usage: playSound \n"); + debugPrintf("Usage: playSound \n"); return true; } @@ -234,7 +234,7 @@ bool MystConsole::Cmd_PlaySound(int argc, const char **argv) { } bool MystConsole::Cmd_StopSound(int argc, const char **argv) { - DebugPrintf("Stopping Sound\n"); + debugPrintf("Stopping Sound\n"); _vm->_sound->stopSound(); @@ -243,8 +243,8 @@ bool MystConsole::Cmd_StopSound(int argc, const char **argv) { bool MystConsole::Cmd_PlayMovie(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Usage: playMovie [] [ ]\n"); - DebugPrintf("NOTE: The movie will play *once* in the background.\n"); + debugPrintf("Usage: playMovie [] [ ]\n"); + debugPrintf("NOTE: The movie will play *once* in the background.\n"); return true; } @@ -258,7 +258,7 @@ bool MystConsole::Cmd_PlayMovie(int argc, const char **argv) { } if (!stackNum) { - DebugPrintf("\'%s\' is not a stack name!\n", argv[2]); + debugPrintf("\'%s\' is not a stack name!\n", argv[2]); return true; } } @@ -277,7 +277,7 @@ bool MystConsole::Cmd_PlayMovie(int argc, const char **argv) { bool MystConsole::Cmd_DisableInitOpcodes(int argc, const char **argv) { if (argc != 1) { - DebugPrintf("Usage: disableInitOpcodes\n"); + debugPrintf("Usage: disableInitOpcodes\n"); return true; } @@ -289,7 +289,7 @@ bool MystConsole::Cmd_DisableInitOpcodes(int argc, const char **argv) { bool MystConsole::Cmd_Cache(int argc, const char **argv) { if (argc > 2) { - DebugPrintf("Usage: cache on/off - Omit parameter to get current state\n"); + debugPrintf("Usage: cache on/off - Omit parameter to get current state\n"); return true; } @@ -304,15 +304,15 @@ bool MystConsole::Cmd_Cache(int argc, const char **argv) { _vm->setCacheState(state); } - DebugPrintf("Cache: %s\n", state ? "Enabled" : "Disabled"); + debugPrintf("Cache: %s\n", state ? "Enabled" : "Disabled"); return true; } bool MystConsole::Cmd_Resources(int argc, const char **argv) { - DebugPrintf("Resources in card %d:\n", _vm->getCurCard()); + debugPrintf("Resources in card %d:\n", _vm->getCurCard()); for (uint i = 0; i < _vm->_resources.size(); i++) { - DebugPrintf("#%2d %s\n", i, _vm->_resources[i]->describe().c_str()); + debugPrintf("#%2d %s\n", i, _vm->_resources[i]->describe().c_str()); } return true; @@ -346,7 +346,7 @@ RivenConsole::~RivenConsole() { bool RivenConsole::Cmd_ChangeCard(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Usage: changeCard \n"); + debugPrintf("Usage: changeCard \n"); return true; } @@ -358,19 +358,19 @@ bool RivenConsole::Cmd_ChangeCard(int argc, const char **argv) { } bool RivenConsole::Cmd_CurCard(int argc, const char **argv) { - DebugPrintf("Current Card: %d\n", _vm->getCurCard()); + debugPrintf("Current Card: %d\n", _vm->getCurCard()); return true; } bool RivenConsole::Cmd_Var(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("Usage: var ()\n"); + debugPrintf("Usage: var ()\n"); return true; } if (!_vm->_vars.contains(argv[1])) { - DebugPrintf("Unknown variable '%s'\n", argv[1]); + debugPrintf("Unknown variable '%s'\n", argv[1]); return true; } @@ -379,13 +379,13 @@ bool RivenConsole::Cmd_Var(int argc, const char **argv) { if (argc > 2) var = (uint32)atoi(argv[2]); - DebugPrintf("%s = %d\n", argv[1], var); + debugPrintf("%s = %d\n", argv[1], var); return true; } bool RivenConsole::Cmd_PlaySound(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Usage: playSound \n"); + debugPrintf("Usage: playSound \n"); return true; } @@ -397,7 +397,7 @@ bool RivenConsole::Cmd_PlaySound(int argc, const char **argv) { bool RivenConsole::Cmd_PlaySLST(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Usage: playSLST \n"); + debugPrintf("Usage: playSLST \n"); return true; } @@ -412,7 +412,7 @@ bool RivenConsole::Cmd_PlaySLST(int argc, const char **argv) { } bool RivenConsole::Cmd_StopSound(int argc, const char **argv) { - DebugPrintf("Stopping Sound\n"); + debugPrintf("Stopping Sound\n"); _vm->_sound->stopSound(); _vm->_sound->stopAllSLST(); @@ -420,20 +420,20 @@ bool RivenConsole::Cmd_StopSound(int argc, const char **argv) { } bool RivenConsole::Cmd_CurStack(int argc, const char **argv) { - DebugPrintf("Current Stack: %s\n", _vm->getStackName(_vm->getCurStack()).c_str()); + debugPrintf("Current Stack: %s\n", _vm->getStackName(_vm->getCurStack()).c_str()); return true; } bool RivenConsole::Cmd_ChangeStack(int argc, const char **argv) { if (argc < 3) { - DebugPrintf("Usage: changeStack \n\n"); - DebugPrintf("Stacks:\n=======\n"); + debugPrintf("Usage: changeStack \n\n"); + debugPrintf("Stacks:\n=======\n"); for (uint i = kStackFirst; i <= kStackLast; i++) - DebugPrintf(" %s\n", _vm->getStackName(i).c_str()); + debugPrintf(" %s\n", _vm->getStackName(i).c_str()); - DebugPrintf("\n"); + debugPrintf("\n"); return true; } @@ -448,7 +448,7 @@ bool RivenConsole::Cmd_ChangeStack(int argc, const char **argv) { } if (stack == kStackUnknown) { - DebugPrintf("\'%s\' is not a stack name!\n", argv[1]); + debugPrintf("\'%s\' is not a stack name!\n", argv[1]); return true; } @@ -459,18 +459,18 @@ bool RivenConsole::Cmd_ChangeStack(int argc, const char **argv) { } bool RivenConsole::Cmd_Hotspots(int argc, const char **argv) { - DebugPrintf("Current card (%d) has %d hotspots:\n", _vm->getCurCard(), _vm->getHotspotCount()); + debugPrintf("Current card (%d) has %d hotspots:\n", _vm->getCurCard(), _vm->getHotspotCount()); for (uint16 i = 0; i < _vm->getHotspotCount(); i++) { - DebugPrintf("Hotspot %d, index %d, BLST ID %d (", i, _vm->_hotspots[i].index, _vm->_hotspots[i].blstID); + debugPrintf("Hotspot %d, index %d, BLST ID %d (", i, _vm->_hotspots[i].index, _vm->_hotspots[i].blstID); if (_vm->_hotspots[i].enabled) - DebugPrintf("enabled"); + debugPrintf("enabled"); else - DebugPrintf("disabled"); + debugPrintf("disabled"); - DebugPrintf(") - (%d, %d, %d, %d)\n", _vm->_hotspots[i].rect.left, _vm->_hotspots[i].rect.top, _vm->_hotspots[i].rect.right, _vm->_hotspots[i].rect.bottom); - DebugPrintf(" Name = %s\n", _vm->getHotspotName(i).c_str()); + debugPrintf(") - (%d, %d, %d, %d)\n", _vm->_hotspots[i].rect.left, _vm->_hotspots[i].rect.top, _vm->_hotspots[i].rect.right, _vm->_hotspots[i].rect.bottom); + debugPrintf(" Name = %s\n", _vm->getHotspotName(i).c_str()); } return true; @@ -480,15 +480,15 @@ bool RivenConsole::Cmd_ZipMode(int argc, const char **argv) { uint32 &zipModeActive = _vm->_vars["azip"]; zipModeActive = !zipModeActive; - DebugPrintf("Zip Mode is "); - DebugPrintf(zipModeActive ? "Enabled" : "Disabled"); - DebugPrintf("\n"); + debugPrintf("Zip Mode is "); + debugPrintf(zipModeActive ? "Enabled" : "Disabled"); + debugPrintf("\n"); return true; } bool RivenConsole::Cmd_DumpScript(int argc, const char **argv) { if (argc < 4) { - DebugPrintf("Usage: dumpScript \n"); + debugPrintf("Usage: dumpScript \n"); return true; } @@ -503,7 +503,7 @@ bool RivenConsole::Cmd_DumpScript(int argc, const char **argv) { } if (newStack == kStackUnknown) { - DebugPrintf("\'%s\' is not a stack name!\n", argv[1]); + debugPrintf("\'%s\' is not a stack name!\n", argv[1]); return true; } @@ -592,7 +592,7 @@ bool RivenConsole::Cmd_DumpScript(int argc, const char **argv) { delete hsptStream; } else { - DebugPrintf("%s doesn't have any scripts!\n", argv[2]); + debugPrintf("%s doesn't have any scripts!\n", argv[2]); } // See above for why this is printed via debugN @@ -600,18 +600,18 @@ bool RivenConsole::Cmd_DumpScript(int argc, const char **argv) { _vm->changeToStack(oldStack); - DebugPrintf("Script dump complete.\n"); + debugPrintf("Script dump complete.\n"); return true; } bool RivenConsole::Cmd_ListZipCards(int argc, const char **argv) { if (_vm->_zipModeData.size() == 0) { - DebugPrintf("No zip card data.\n"); + debugPrintf("No zip card data.\n"); } else { - DebugPrintf("Listing zip cards:\n"); + debugPrintf("Listing zip cards:\n"); for (uint32 i = 0; i < _vm->_zipModeData.size(); i++) - DebugPrintf("ID = %d, Name = %s\n", _vm->_zipModeData[i].id, _vm->_zipModeData[i].name.c_str()); + debugPrintf("ID = %d, Name = %s\n", _vm->_zipModeData[i].id, _vm->_zipModeData[i].name.c_str()); } return true; @@ -619,7 +619,7 @@ bool RivenConsole::Cmd_ListZipCards(int argc, const char **argv) { bool RivenConsole::Cmd_GetRMAP(int argc, const char **argv) { uint32 rmapCode = _vm->getCurCardRMAP(); - DebugPrintf("RMAP for %s %d = %08x\n", _vm->getStackName(_vm->getCurStack()).c_str(), _vm->getCurCard(), rmapCode); + debugPrintf("RMAP for %s %d = %08x\n", _vm->getStackName(_vm->getCurStack()).c_str(), _vm->getCurCard(), rmapCode); return true; } @@ -633,20 +633,20 @@ bool RivenConsole::Cmd_Combos(int argc, const char **argv) { uint32 prisonCombo = _vm->_vars["pcorrectorder"]; uint32 domeCombo = _vm->_vars["adomecombo"]; - DebugPrintf("Telescope Combo:\n "); + debugPrintf("Telescope Combo:\n "); for (int i = 0; i < 5; i++) - DebugPrintf("%d ", _vm->_externalScriptHandler->getComboDigit(teleCombo, i)); + debugPrintf("%d ", _vm->_externalScriptHandler->getComboDigit(teleCombo, i)); - DebugPrintf("\nPrison Combo:\n "); + debugPrintf("\nPrison Combo:\n "); for (int i = 0; i < 5; i++) - DebugPrintf("%d ", _vm->_externalScriptHandler->getComboDigit(prisonCombo, i)); + debugPrintf("%d ", _vm->_externalScriptHandler->getComboDigit(prisonCombo, i)); - DebugPrintf("\nDome Combo:\n "); + debugPrintf("\nDome Combo:\n "); for (int i = 1; i <= 25; i++) if (domeCombo & (1 << (25 - i))) - DebugPrintf("%d ", i); + debugPrintf("%d ", i); - DebugPrintf("\n"); + debugPrintf("\n"); return true; } @@ -654,7 +654,7 @@ bool RivenConsole::Cmd_SliderState(int argc, const char **argv) { if (argc > 1) _vm->_externalScriptHandler->setDomeSliderState((uint32)atoi(argv[1])); - DebugPrintf("Dome Slider State = %08x\n", _vm->_externalScriptHandler->getDomeSliderState()); + debugPrintf("Dome Slider State = %08x\n", _vm->_externalScriptHandler->getDomeSliderState()); return true; } @@ -672,7 +672,7 @@ LivingBooksConsole::~LivingBooksConsole() { bool LivingBooksConsole::Cmd_PlaySound(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("Usage: playSound \n"); + debugPrintf("Usage: playSound \n"); return true; } @@ -682,7 +682,7 @@ bool LivingBooksConsole::Cmd_PlaySound(int argc, const char **argv) { } bool LivingBooksConsole::Cmd_StopSound(int argc, const char **argv) { - DebugPrintf("Stopping Sound\n"); + debugPrintf("Stopping Sound\n"); _vm->_sound->stopSound(); return true; @@ -690,7 +690,7 @@ bool LivingBooksConsole::Cmd_StopSound(int argc, const char **argv) { bool LivingBooksConsole::Cmd_DrawImage(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("Usage: drawImage \n"); + debugPrintf("Usage: drawImage \n"); return true; } @@ -701,13 +701,13 @@ bool LivingBooksConsole::Cmd_DrawImage(int argc, const char **argv) { bool LivingBooksConsole::Cmd_ChangePage(int argc, const char **argv) { if (argc < 2 || argc > 3) { - DebugPrintf("Usage: changePage [.] []\n"); + debugPrintf("Usage: changePage [.] []\n"); return true; } int page, subpage = 0; if (sscanf(argv[1], "%d.%d", &page, &subpage) == 0) { - DebugPrintf("Usage: changePage [.] []\n"); + debugPrintf("Usage: changePage [.] []\n"); return true; } LBMode mode = argc == 2 ? _vm->getCurMode() : (LBMode)atoi(argv[2]); @@ -718,7 +718,7 @@ bool LivingBooksConsole::Cmd_ChangePage(int argc, const char **argv) { if (_vm->loadPage(mode, page, subpage)) return false; } - DebugPrintf("no such page %d.%d\n", page, subpage); + debugPrintf("no such page %d.%d\n", page, subpage); return true; } @@ -740,7 +740,7 @@ CSTimeConsole::~CSTimeConsole() { bool CSTimeConsole::Cmd_PlaySound(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("Usage: playSound \n"); + debugPrintf("Usage: playSound \n"); return true; } @@ -750,7 +750,7 @@ bool CSTimeConsole::Cmd_PlaySound(int argc, const char **argv) { } bool CSTimeConsole::Cmd_StopSound(int argc, const char **argv) { - DebugPrintf("Stopping Sound\n"); + debugPrintf("Stopping Sound\n"); _vm->_sound->stopSound(); return true; @@ -758,7 +758,7 @@ bool CSTimeConsole::Cmd_StopSound(int argc, const char **argv) { bool CSTimeConsole::Cmd_DrawImage(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("Usage: drawImage \n"); + debugPrintf("Usage: drawImage \n"); return true; } @@ -769,7 +769,7 @@ bool CSTimeConsole::Cmd_DrawImage(int argc, const char **argv) { bool CSTimeConsole::Cmd_DrawSubimage(int argc, const char **argv) { if (argc < 3) { - DebugPrintf("Usage: drawSubimage \n"); + debugPrintf("Usage: drawSubimage \n"); return true; } @@ -780,7 +780,7 @@ bool CSTimeConsole::Cmd_DrawSubimage(int argc, const char **argv) { bool CSTimeConsole::Cmd_ChangeCase(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Usage: changeCase \n"); + debugPrintf("Usage: changeCase \n"); return true; } @@ -790,7 +790,7 @@ bool CSTimeConsole::Cmd_ChangeCase(int argc, const char **argv) { bool CSTimeConsole::Cmd_ChangeScene(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Usage: changeScene \n"); + debugPrintf("Usage: changeScene \n"); return true; } @@ -800,12 +800,12 @@ bool CSTimeConsole::Cmd_ChangeScene(int argc, const char **argv) { bool CSTimeConsole::Cmd_CaseVariable(int argc, const char **argv) { if (argc < 2) { - DebugPrintf("Usage: caseVariable []\n"); + debugPrintf("Usage: caseVariable []\n"); return true; } if (argc == 2) { - DebugPrintf("case variable %d has value %d\n", atoi(argv[1]), _vm->_caseVariable[atoi(argv[1])]); + debugPrintf("case variable %d has value %d\n", atoi(argv[1]), _vm->_caseVariable[atoi(argv[1])]); } else { _vm->_caseVariable[atoi(argv[1])] = atoi(argv[2]); } @@ -814,7 +814,7 @@ bool CSTimeConsole::Cmd_CaseVariable(int argc, const char **argv) { bool CSTimeConsole::Cmd_InvItem(int argc, const char **argv) { if (argc < 3) { - DebugPrintf("Usage: invItem <0 or 1>\n"); + debugPrintf("Usage: invItem <0 or 1>\n"); return true; } -- cgit v1.2.3