diff options
| author | Johannes Schickel | 2005-11-13 19:35:01 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2005-11-13 19:35:01 +0000 |
| commit | e0aef914fd2ef0eb852ea325028d29991e2f9a62 (patch) | |
| tree | 6bd811f691d029666f1d0f5880f67ef1b0cd0268 /kyra/script_v1.cpp | |
| parent | 267fc7e2f652feaf6168d65ccf2916e09fe12edb (diff) | |
| download | scummvm-rg350-e0aef914fd2ef0eb852ea325028d29991e2f9a62.tar.gz scummvm-rg350-e0aef914fd2ef0eb852ea325028d29991e2f9a62.tar.bz2 scummvm-rg350-e0aef914fd2ef0eb852ea325028d29991e2f9a62.zip | |
Fixed a bug with the sprite loader and various things related to
the scene switching code. Now the intro works correctly with a minor graphics glitch.
svn-id: r19588
Diffstat (limited to 'kyra/script_v1.cpp')
| -rw-r--r-- | kyra/script_v1.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index 90a9d52d3b..65c41eb850 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -115,10 +115,10 @@ void ScriptHelper::c1_subSP() { } void ScriptHelper::c1_execOpcode() { - assert((int)_parameter < _curScript->dataPtr->opcodeSize); - if (_curScript->dataPtr->opcodes[_parameter] == &KyraEngine::cmd_dummy) - debug("calling unimplemented opcode(0x%.02X)", _parameter); - _curScript->retValue = (_vm->*_curScript->dataPtr->opcodes[_parameter])(_curScript); + assert((uint8)_parameter < _curScript->dataPtr->opcodeSize); + if (_curScript->dataPtr->opcodes[(uint8)_parameter] == &KyraEngine::cmd_dummy) + debug("calling unimplemented opcode(0x%.02X)", (uint8)_parameter); + _curScript->retValue = (_vm->*_curScript->dataPtr->opcodes[(uint8)_parameter])(_curScript); } void ScriptHelper::c1_ifNotJmp() { @@ -296,7 +296,7 @@ void ScriptHelper::c1_setRetAndJmp() { #pragma mark - #define stackPos(x) script->stack[script->sp+x] -#define stackPosString(x) (char *)&script->dataPtr->text[READ_BE_UINT16( &((uint16 *)script->dataPtr->text)[stackPos(x)])] +#define stackPosString(x) (char*)&script->dataPtr->text[READ_BE_UINT16(&((uint16 *)script->dataPtr->text)[stackPos(x)])] int KyraEngine::cmd_magicInMouseItem(ScriptState *script) { warning("STUB: cmd_magicInMouseItem"); |