diff options
| author | Travis Howell | 2006-10-25 13:38:35 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-10-25 13:38:35 +0000 |
| commit | 05fd51d03611fc88041a68da384eac58f3049024 (patch) | |
| tree | d2e7bc921e00fb7f912325d2170a14a19e3202f6 /engines/agos/script_e1.cpp | |
| parent | fc04b2e45adbdc617fb6e20b3de81c88f5f10eff (diff) | |
| download | scummvm-rg350-05fd51d03611fc88041a68da384eac58f3049024.tar.gz scummvm-rg350-05fd51d03611fc88041a68da384eac58f3049024.tar.bz2 scummvm-rg350-05fd51d03611fc88041a68da384eac58f3049024.zip | |
Cleanup
svn-id: r24501
Diffstat (limited to 'engines/agos/script_e1.cpp')
| -rw-r--r-- | engines/agos/script_e1.cpp | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp index a58125b85f..8eb9759809 100644 --- a/engines/agos/script_e1.cpp +++ b/engines/agos/script_e1.cpp @@ -130,7 +130,7 @@ void AGOSEngine::setupElvira1Opcodes(OpcodeProc *op) { op[162] = &AGOSEngine::oe1_cFlag; - op[164] = &AGOSEngine::o1_rescan; + op[164] = &AGOSEngine::oe1_rescan; op[176] = &AGOSEngine::oe1_setUserItem; op[177] = &AGOSEngine::oe1_getUserItem; @@ -153,8 +153,8 @@ void AGOSEngine::setupElvira1Opcodes(OpcodeProc *op) { op[224] = &AGOSEngine::o_picture; op[225] = &AGOSEngine::o_loadZone; - op[226] = &AGOSEngine::o1_animate; - op[227] = &AGOSEngine::o1_stopAnimate; + op[226] = &AGOSEngine::oe1_animate; + op[227] = &AGOSEngine::oe1_stopAnimate; op[228] = &AGOSEngine::o_killAnimate; op[229] = &AGOSEngine::o_defWindow; op[230] = &AGOSEngine::o_window; @@ -187,7 +187,7 @@ void AGOSEngine::setupElvira1Opcodes(OpcodeProc *op) { op[260] = &AGOSEngine::oe1_ifTime; op[261] = &AGOSEngine::o_here; op[262] = &AGOSEngine::o_doClassIcons; - op[263] = &AGOSEngine::o1_playTune; + op[263] = &AGOSEngine::os1_playTune; op[266] = &AGOSEngine::o_setAdjNoun; op[267] = &AGOSEngine::oe1_zoneDisk; op[268] = &AGOSEngine::o_saveUserGame; @@ -406,6 +406,11 @@ void AGOSEngine::oe1_cFlag() { setScriptCondition((c->flags & (1 << bit)) != 0); } +void AGOSEngine::oe1_rescan() { + // 164: restart subroutine + setScriptReturn(-10); +} + void AGOSEngine::oe1_setUserItem() { // 176: set user item Item *i = getNextItemPtr(); @@ -508,6 +513,28 @@ void AGOSEngine::oe1_nextMaster() { _objectItem = nextMaster(item, ad, no); } +void AGOSEngine::oe1_animate() { + // 226: animate + uint vgaSpriteId = getVarOrWord(); + uint windowNum = getVarOrByte(); + uint x = getVarOrWord(); + uint y = getVarOrWord(); + uint palette = getVarOrWord(); + + if (getGameType() == GType_SIMON1 && (getFeatures() & GF_TALKIE) && vgaSpriteId >= 400) { + _lastVgaWaitFor = 0; + } + + _lockWord |= 0x40; + animate(windowNum, vgaSpriteId / 100, vgaSpriteId, x, y, palette); + _lockWord &= ~0x40; +} + +void AGOSEngine::oe1_stopAnimate() { + // 227: stop animate + stopAnimateSimon1(getVarOrWord()); +} + void AGOSEngine::oe1_menu() { // 233: agos menu uint b = getVarOrWord(); |