diff options
| author | Gregory Montoir | 2003-11-26 20:40:43 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2003-11-26 20:40:43 +0000 |
| commit | 871c4f8342ed4063a18a5ed4cb1f2e8b78b9dee2 (patch) | |
| tree | 5950ff38f2760c56bf2199573e6f483973eb7d4e /queen/command.cpp | |
| parent | a5d8cacdad4930a12e380ddaaf1b6a9108efae87 (diff) | |
| download | scummvm-rg350-871c4f8342ed4063a18a5ed4cb1f2e8b78b9dee2.tar.gz scummvm-rg350-871c4f8342ed4063a18a5ed4cb1f2e8b78b9dee2.tar.bz2 scummvm-rg350-871c4f8342ed4063a18a5ed4cb1f2e8b78b9dee2.zip | |
rename some methods (purely cosmetic) and fix some walking problems when closing Journal screen
svn-id: r11373
Diffstat (limited to 'queen/command.cpp')
| -rw-r--r-- | queen/command.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/queen/command.cpp b/queen/command.cpp index 5577c6f5b7..1561f7ac41 100644 --- a/queen/command.cpp +++ b/queen/command.cpp @@ -563,7 +563,7 @@ int16 Command::makeJoeWalkTo(int16 x, int16 y, int16 objNum, const Verb &v, bool _logic->joeFace(); } else { - p = _walk->joeMove(facing, x, y, false); // XXX inCutaway parameter + p = _walk->moveJoe(facing, x, y, false); // XXX inCutaway parameter // XXX if(P != 0) P = FIND_VERB } } @@ -843,7 +843,8 @@ bool Command::executeIfCutaway(const char *description) { if (strlen(description) > 4 && scumm_stricmp(description + strlen(description) - 4, ".cut") == 0) { - _graphics->textClear(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS); +// _graphics->textClear(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS); + clear(true); char nextCutaway[20]; memset(nextCutaway, 0, sizeof(nextCutaway)); @@ -863,7 +864,8 @@ bool Command::executeIfDialog(const char *description) { scumm_stricmp(description + strlen(description) - 4, ".dog") == 0) { char cutaway[20]; - _graphics->textClear(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS); +// _graphics->textClear(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS); + clear(true); _logic->dialogue(description, _selCmd.noun, cutaway); @@ -891,7 +893,8 @@ bool Command::handleBadCommand(bool walk) { if (_selCmd.action.isNone()) { _graphics->textClear(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS); } - _walk->joeMove(0, _selPosX, _selPosY, false); // XXX inCutaway parameter +debug(0, "_walk->moveJoe(%d, %d)", _selPosX, _selPosY); + _walk->moveJoe(0, _selPosX, _selPosY, false); // XXX inCutaway parameter return true; } // check to see if one of the objects is hidden |