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

PRINCE: O_ENABLEDIALOGOPT(), O_DISABLEDIALOGOPT() update. O_CHECKBACKANIMFRAME(), O_BACKANIMUPDATEOFF(), dialogLMB() fix

Browse source
This commit is contained in:
lukaslw 2014-07-03 22:35:41 +02:00
parent 4792795ac7
commit af7c167cc1
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/prince/prince.cpp
View file

@ -2367,16 +2367,15 @@ void PrinceEngine::dialogLeftMouseButton(byte *string, int dialogSelected) {
talkHero(0);
int dialogDataValue = (int)READ_UINT32(_dialogData);
int newValue = (dialogDataValue & (1 << dialogSelected)); // FIXME
WRITE_UINT32(_dialogData, newValue); // FIXME
dialogDataValue |= (1u << dialogSelected);
WRITE_UINT32(_dialogData, dialogDataValue);
_flags->setFlagValue(Flags::BOXSEL, dialogSelected + 1);
setVoice(0, 28, dialogSelected + 1);
int dialogOpt = dialogSelected << 4;
_flags->setFlagValue(Flags::VOICE_H_LINE, _dialogOptLines[dialogOpt]);
_flags->setFlagValue(Flags::VOICE_A_LINE, _dialogOptLines[dialogOpt + 1]);
_flags->setFlagValue(Flags::VOICE_B_LINE, _dialogOptLines[dialogOpt + 2]);
_flags->setFlagValue(Flags::VOICE_H_LINE, _dialogOptLines[dialogSelected * 4]);
_flags->setFlagValue(Flags::VOICE_A_LINE, _dialogOptLines[dialogSelected * 4 + 1]);
_flags->setFlagValue(Flags::VOICE_B_LINE, _dialogOptLines[dialogSelected * 4 + 2]);
_interpreter->setString(_dialogOptAddr[dialogSelected]);
}

10
engines/prince/script.cpp
View file

@ -684,7 +684,7 @@ void Interpreter::O_CHECKBACKANIMFRAME() {
uint16 frameId = readScriptFlagValue();
int currAnim = _vm->_backAnimList[slotId]._seq._currRelative;
if (_vm->_backAnimList[slotId].backAnims[currAnim]._frame != frameId) {
//esi -= 6; loop of this OP?
_currentInstruction -= 6;
_opcodeNF = 1;
}
debugInterpreter("O_CHECKBACKANIMFRAME slotId %d, frameId %d", slotId, frameId);
@ -781,7 +781,7 @@ void Interpreter::O_BACKANIMUPDATEOFF() {
void Interpreter::O_BACKANIMUPDATEON() {
uint16 slotId = readScriptFlagValue();
int currAnim = _vm->_backAnimList[slotId]._seq._currRelative;
_vm->_backAnimList[slotId].backAnims[currAnim]._state = 1;
_vm->_backAnimList[slotId].backAnims[currAnim]._state = 0;
debugInterpreter("O_BACKANIMUPDATEON %d", slotId);
}
@ -1437,11 +1437,17 @@ void Interpreter::O_INITDIALOG() {
void Interpreter::O_ENABLEDIALOGOPT() {
uint16 opt = readScriptFlagValue();
debugInterpreter("O_ENABLEDIALOGOPT opt %d", opt);
int dialogDataValue = (int)READ_UINT32(_vm->_dialogData);
dialogDataValue &= ~(1u << opt);
WRITE_UINT32(_vm->_dialogData, dialogDataValue);
}
void Interpreter::O_DISABLEDIALOGOPT() {
uint16 opt = readScriptFlagValue();
debugInterpreter("O_DISABLEDIALOGOPT opt %d", opt);
int dialogDataValue = (int)READ_UINT32(_vm->_dialogData);
dialogDataValue |= (1u << opt);
WRITE_UINT32(_vm->_dialogData, dialogDataValue);
}
void Interpreter::O_SHOWDIALOGBOX() {