diff options
author | Johannes Schickel | 2008-03-18 15:50:43 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-03-18 15:50:43 +0000 |
commit | 2af4fc103499236cf79c7cfafeaaa622ea63e7cd (patch) | |
tree | 007490301b3532caae450e610d90dc4ef7cf07f2 /engines/kyra/kyra_v2.h | |
parent | 8e98e35b56034c42a150fd5b8adf2a67255b4609 (diff) | |
download | scummvm-rg350-2af4fc103499236cf79c7cfafeaaa622ea63e7cd.tar.gz scummvm-rg350-2af4fc103499236cf79c7cfafeaaa622ea63e7cd.tar.bz2 scummvm-rg350-2af4fc103499236cf79c7cfafeaaa622ea63e7cd.zip |
- Implemented opcodes:
-> 21: o2_backUpScreen
-> 22: o2_restoreScreen
-> 28: o2_addItemToInventory
-> 50: o2_wipeDownMouseItem
-> 67: o2_loadPalette384
-> 68: o2_setPalette384
-> 165: o2_disableTimer
-> 166: o2_enableTimer
-> 167: o2_setTimerCountdown
- renamed some timer functions
svn-id: r31182
Diffstat (limited to 'engines/kyra/kyra_v2.h')
-rw-r--r-- | engines/kyra/kyra_v2.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index 1f227c4f4d..70b8902c40 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -593,6 +593,7 @@ protected: void clearInventorySlot(int slot, int page); void redrawInventory(int page); void scrollInventoryWheel(); + int findFreeVisibleInventorySlot(); struct ItemAnimData { int16 itemIndex; @@ -603,7 +604,6 @@ protected: } _itemAnimData[15]; int _nextAnimItem; - bool _holdItemAnims; // gui void loadButtonShapes(); @@ -908,11 +908,11 @@ protected: void snd_playSoundEffect(int track); // timer - void timerFunc2(int); + void timerFadeOutMessage(int); void timerCauldronAnimation(int); void timerFunc4(int); void timerFunc5(int); - void timerFunc6(int); + void timerBurnZanthia(int); void setTimer1DelaySecs(int secs); @@ -967,12 +967,15 @@ protected: int o2_showChapterMessage(ScriptState *script); int o2_restoreTalkTextMessageBkgd(ScriptState *script); int o2_wsaClose(ScriptState *script); - int o2_meanWhileScene(ScriptState *script); + int o2_meanWhileScene(ScriptState *script); + int o2_backUpScreen(ScriptState *script); + int o2_restoreScreen(ScriptState *script); int o2_displayWsaFrame(ScriptState *script); int o2_displayWsaSequentialFramesLooping(ScriptState *script); int o2_wsaOpen(ScriptState *script); int o2_displayWsaSequentialFrames(ScriptState *script); int o2_displayWsaSequence(ScriptState *script); + int o2_addItemToInventory(ScriptState *script); int o2_drawShape(ScriptState *script); int o2_addItemToCurScene(ScriptState *script); int o2_checkForItem(ScriptState *script); @@ -990,6 +993,7 @@ protected: int o2_addSpecialExit(ScriptState *script); int o2_setMousePos(ScriptState *script); int o2_showMouse(ScriptState *script); + int o2_wipeDownMouseItem(ScriptState *script); //int o2_playSoundEffect(ScriptState *script); int o2_delaySecs(ScriptState *script); int o2_delay(ScriptState *script); @@ -1000,6 +1004,8 @@ protected: int o2_drawSceneShapeOnPage(ScriptState *script); int o2_disableAnimObject(ScriptState *script); int o2_enableAnimObject(ScriptState *script); + int o2_loadPalette384(ScriptState *script); + int o2_setPalette384(ScriptState *script); int o2_restoreBackBuffer(ScriptState *script); int o2_backUpInventoryGfx(ScriptState *script); int o2_disableSceneAnim(ScriptState *script); @@ -1065,6 +1071,9 @@ protected: int o2_customChatFinish(ScriptState *script); int o2_setupSceneAnimation(ScriptState *script); int o2_stopSceneAnimation(ScriptState *script); + int o2_disableTimer(ScriptState *script); + int o2_enableTimer(ScriptState *script); + int o2_setTimerCountdown(ScriptState *script); int o2_processPaletteIndex(ScriptState *script); int o2_getBoolFromStack(ScriptState *script); int o2_setVocHigh(ScriptState *script); |