[Scummvm-cvs-logs] scummvm master -> 2e231150eba5e57f1f542f6a3938c9256995be70
athrxx
athrxx at scummvm.org
Tue Apr 23 22:41:41 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2e231150eb KYRA: (EOB) - minor changes to debugger
Commit: 2e231150eba5e57f1f542f6a3938c9256995be70
https://github.com/scummvm/scummvm/commit/2e231150eba5e57f1f542f6a3938c9256995be70
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-23T13:26:23-07:00
Commit Message:
KYRA: (EOB) - minor changes to debugger
- display some more info in show_position
- remove unused variable
Changed paths:
engines/kyra/debugger.cpp
diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index 702707e..84f956f 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -578,7 +578,7 @@ bool Debugger_EoB::cmd_listMonsters(int, const char **) {
}
bool Debugger_EoB::cmd_showPosition(int, const char **) {
- DebugPrintf("\nCurrent level: %d\nCurrent Sub Level: %d\nCurrent block: %d\nCurrent direction: %d\n\n", _vm->_currentLevel, _vm->_currentSub, _vm->_currentBlock, _vm->_currentDirection);
+ DebugPrintf("\nCurrent level: %d\nCurrent Sub Level: %d\nCurrent block: %d (0x%.04x)\nNext block: %d (0x%.04x)\nCurrent direction: %d\n\n", _vm->_currentLevel, _vm->_currentSub, _vm->_currentBlock, _vm->_currentBlock, _vm->calcNewBlockPosition(_vm->_currentBlock, _vm->_currentDirection), _vm->calcNewBlockPosition(_vm->_currentBlock, _vm->_currentDirection), _vm->_currentDirection);
return true;
}
@@ -639,7 +639,6 @@ bool Debugger_EoB::cmd_closeDoor(int, const char **) {
uint16 block = _vm->calcNewBlockPosition(_vm->_currentBlock, _vm->_currentDirection);
int c = (_vm->_wllWallFlags[_vm->_levelBlockProperties[block].walls[0]] & 8) ? 0 : 1;
int v = _vm->_levelBlockProperties[block].walls[c];
- int flg = (_vm->_flags.gameID == GI_EOB1) ? 1 : 0x10;
if ((_vm->_flags.gameID == GI_EOB1 && !(_vm->_wllWallFlags[v] & 1)) || (_vm->_flags.gameID == GI_EOB2 && (_vm->_wllWallFlags[v] & 0x20))) {
DebugPrintf("Couldn't close any door. Make sure you're facing the door you wish to open and standing right in front of it.\n\n");
} else {
More information about the Scummvm-git-logs
mailing list