libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix a potiental journal issue

Browse Source 
svn-id: r11478
This commit is contained in:
Gregory Montoir 2003-12-02 19:58:31 +00:00
parent 2592184788
commit a15fa0302a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
queen/command.cpp
View File

@ -247,14 +247,12 @@ void Command::executeCurrentAction(bool walk) {
}
else if (cond >= 0) {
// we've had a successful Gamestate check, so we must now exit
executeCommand(comId, cond);
cond = executeCommand(comId, cond);
break;
}
}
if (_selCmd.action.value() == VERB_LOOK_AT) {
// Look At, do standard look at routine
if (cond <= 0 && _selCmd.action.value() == VERB_LOOK_AT) {
look();
}
else {
@ -358,7 +356,7 @@ void Command::readCommandsFrom(byte *&ptr) {
}
void Command::executeCommand(uint16 comId, int16 condResult) {
int16 Command::executeCommand(uint16 comId, int16 condResult) {
// execute.c l.313-452
debug(0, "Command::executeCommand() - cond = %X, com = %X", condResult, comId);
@ -448,7 +446,7 @@ void Command::executeCommand(uint16 comId, int16 condResult) {
switch (com->specialSection) {
case 1:
_logic->useJournal();
return;
return condResult;
case 2:
_logic->joeUseDress(true);
break;
@ -477,6 +475,7 @@ void Command::executeCommand(uint16 comId, int16 condResult) {
if (condResult > 0) {
_logic->joeSpeak(condResult, true);
}
return condResult;
}

2
queen/command.h
View File

@ -109,7 +109,7 @@ public:
private:
void executeCommand(uint16 comId, int16 condResult);
int16 executeCommand(uint16 comId, int16 condResult);
int16 makeJoeWalkTo(int16 x, int16 y, int16 objNum, const Verb &v, bool mustWalk);

1
queen/logic.cpp
View File

@ -1908,6 +1908,7 @@ void Logic::playCutaway(const char *cutFile, char *next) {
if (next == NULL) {
next = nextFile;
}
_graphics->textClear(CmdText::COMMAND_Y_POS, CmdText::COMMAND_Y_POS);
Cutaway::run(cutFile, next, _graphics, _input, this, _resource, _sound);
}