libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 16:03:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

possible 'fix' for bug #1233495 (FOTAQ code is so hackish...)

Browse Source 
svn-id: r18506
This commit is contained in:
Gregory Montoir 2005-07-06 22:35:18 +00:00
parent bcc3bd9708
commit fc4c06309c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
queen/command.cpp
View File

@ -226,16 +226,20 @@ void Command::executeCurrentAction() {
}
}
if (cond <= 0 && _state.selAction == VERB_LOOK_AT) {
lookAtSelectedObject();
} else {
// only play song if it's a PLAY AFTER type
if (com->song < 0) {
_vm->sound()->playSong(-com->song);
}
if (_state.selAction == VERB_USE_JOURNAL) {
clear(true);
} else {
if (cond <= 0 && _state.selAction == VERB_LOOK_AT) {
lookAtSelectedObject();
} else {
// only play song if it's a PLAY AFTER type
if (com->song < 0) {
_vm->sound()->playSong(-com->song);
}
clear(true);
}
cleanupCurrentAction();
}
cleanupCurrentAction();
}
void Command::updatePlayer() {
@ -433,6 +437,7 @@ int16 Command::executeCommand(uint16 comId, int16 condResult) {
switch (com->specialSection) {
case 1:
_vm->logic()->useJournal();
_state.selAction = VERB_USE_JOURNAL;
return condResult;
case 2:
_vm->logic()->joeUseDress(true);