thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

STARK: Make debug command output more consistent (#1609)

Browse source 
The 'Too few args' message should only be
displayed if some but not enough arguments
are provided. Otherwise just show the
instructions of the command.

Fixes #1464.
This commit is contained in:
GunnarBirke 2020-02-29 15:02:06 +01:00 • committed by GitHub
parent 94954491e0
commit 837c9f9099
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

58
engines/stark/console.cpp
View file

@ -214,7 +214,7 @@ bool Console::Cmd_ChangeKnowledge(int argc, const char **argv) {
} else { } else {
debugPrintf("Invalid type: %c, only b and i are available\n", type); debugPrintf("Invalid type: %c, only b and i are available\n", type);
} }
} else { } else if (argc > 1 ) {
debugPrintf("Too few args\n"); debugPrintf("Too few args\n");
} }
@ -291,8 +291,6 @@ bool Console::Cmd_EnableScript(int argc, const char **argv) {
} else { } else {
debugPrintf("Invalid index %d, only %d indices available\n", index, scripts.size()); debugPrintf("Invalid index %d, only %d indices available\n", index, scripts.size());
} }
} else {
debugPrintf("Too few args\n");
} }
debugPrintf("Enable or disable a script. Use listScripts to get an id\n"); debugPrintf("Enable or disable a script. Use listScripts to get an id\n");
@ -323,8 +321,6 @@ bool Console::Cmd_ForceScript(int argc, const char **argv) {
} else { } else {
debugPrintf("Invalid index %d, only %d indices available\n", index, scripts.size()); debugPrintf("Invalid index %d, only %d indices available\n", index, scripts.size());
} }
} else {
debugPrintf("Too few args\n");
} }
debugPrintf("Force the execution of a script. Use listScripts to get an id\n"); debugPrintf("Force the execution of a script. Use listScripts to get an id\n");
@ -361,8 +357,6 @@ bool Console::Cmd_DecompileScript(int argc, const char **argv) {
} else { } else {
debugPrintf("Invalid index %d, only %d indices available\n", index, scripts.size()); debugPrintf("Invalid index %d, only %d indices available\n", index, scripts.size());
} }
} else {
debugPrintf("Too few args\n");
} }
debugPrintf("Decompile a script. Use listScripts to get an id\n"); debugPrintf("Decompile a script. Use listScripts to get an id\n");
@ -686,32 +680,34 @@ bool Console::Cmd_ListLocations(int argc, const char **argv) {
} }
bool Console::Cmd_ChangeLocation(int argc, const char **argv) { bool Console::Cmd_ChangeLocation(int argc, const char **argv) {
if (argc != 3) { if (argc >= 3) {
debugPrintf("Change the current location. Use listLocations to get indices\n"); // Assert indices
debugPrintf("Usage :\n"); Common::String xarcFileName = Common::String::format("%s/%s/%s.xarc", argv[1], argv[2], argv[2]);
debugPrintf("changeLocation [level] [location]\n"); if (!Common::File::exists(xarcFileName)) {
return true; debugPrintf("Invalid location %s %s. Use listLocations to get correct indices\n", argv[1], argv[2]);
return true;
}
uint levelIndex = strtol(argv[1] , nullptr, 16);
uint locationIndex = strtol(argv[2] , nullptr, 16);
StarkUserInterface->changeScreen(Screen::kScreenGame);
if (!StarkGlobal->getRoot()) {
StarkResourceProvider->initGlobal();
}
StarkResourceProvider->requestLocationChange(levelIndex, locationIndex);
return false;
} else if (argc > 1) {
debugPrintf("Too few args\n");
} }
// Assert indices debugPrintf("Change the current location. Use listLocations to get indices\n");
Common::String xarcFileName = Common::String::format("%s/%s/%s.xarc", argv[1], argv[2], argv[2]); debugPrintf("Usage :\n");
if (!Common::File::exists(xarcFileName)) { debugPrintf("changeLocation [level] [location]\n");
debugPrintf("Invalid location %s %s. Use listLocations to get correct indices\n", argv[1], argv[2]); return true;
return true;
}
uint levelIndex = strtol(argv[1] , nullptr, 16);
uint locationIndex = strtol(argv[2] , nullptr, 16);
StarkUserInterface->changeScreen(Screen::kScreenGame);
if (!StarkGlobal->getRoot()) {
StarkResourceProvider->initGlobal();
}
StarkResourceProvider->requestLocationChange(levelIndex, locationIndex);
return false;
} }
bool Console::Cmd_ChangeChapter(int argc, const char **argv) { bool Console::Cmd_ChangeChapter(int argc, const char **argv) {