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

- add opcode 146 - resetInputColorCode()

Browse source 
- add updateWaterFlasks()
- some fixes for mouse pointer positioning in sjis mode
- bug fix for tim player

svn-id: r31136
This commit is contained in:
Florian Kagerer 2008-03-16 02:00:14 +00:00
parent 7074132276
commit b75c790c7a
8 changed files with 47 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/kyra/script_v2.cpp
View file

@ -410,7 +410,7 @@ int KyraEngine_v2::o2_addSpecialExit(ScriptState *script) {
int KyraEngine_v2::o2_setMousePos(ScriptState *script) {
debugC(3, kDebugLevelScriptFuncs, "o2_setMousePos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
_system->warpMouse(stackPos(0), stackPos(1));
setMousePos(stackPos(0), stackPos(1));
return 0;
}
@ -661,7 +661,7 @@ int KyraEngine_v2::o2_showLetter(ScriptState *script) {
_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0);
_screen->fadePalette(_screen->getPalette(0), 0x14);
_screen->setMouseCursor(0, 0, getShapePtr(0));
_system->warpMouse(280, 160);
setMousePos(280, 160);
_screen->showMouse();
@ -786,7 +786,7 @@ int KyraEngine_v2::o2_updateSceneAnim(ScriptState *script) {
}
int KyraEngine_v2::o2_setSceneAnimPosAndUpdate(ScriptState *script) {
debugC(3, kDebugLevelScriptFuncs, "o2_updateSceneAnim(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
debugC(3, kDebugLevelScriptFuncs, "o2_setSceneAnimPosAndUpdate(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
const int anim = stackPos(0);
_sceneAnims[anim].x2 = stackPos(1);
_sceneAnims[anim].y2 = stackPos(2);
@ -1039,6 +1039,12 @@ int KyraEngine_v2::o2_querySpecialSceneScriptState(ScriptState *script) {
return _specialSceneScriptState[stackPos(0)];
}
int KyraEngine_v2::o2_resetInputColorCode(ScriptState *script) {
debugC(3, kDebugLevelScriptFuncs, "o2_resetInputColorCode(%p)", (const void *)script);
memset(_inputColorCode, 255, 7);
return 0;
}
int KyraEngine_v2::o2_setHiddenItemsEntry(ScriptState *script) {
debugC(3, kDebugLevelScriptFuncs, "o2_setHiddenItemsEntry(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
return (_hiddenItems[stackPos(0)] = stackPos(1));