Commit Graph

92 Commits

Author SHA1 Message Date
Johannes Schickel
09b0f12852 Yet more opcodes moved to KyraEngine_v2.
svn-id: r31861
2008-05-04 13:25:03 +00:00
Johannes Schickel
c43cbeae96 Moved more opcodes to KyraEngine_v2.
svn-id: r31859
2008-05-04 13:07:13 +00:00
Johannes Schickel
7e3ce73a58 Moved more opcodes to KyraEngine_v2.
svn-id: r31845
2008-05-03 20:02:51 +00:00
Johannes Schickel
f6239f1db6 Moved some more opcodes to KyraEngine_v2.
svn-id: r31843
2008-05-03 19:47:07 +00:00
Johannes Schickel
d5545bd8c5 - Moved newShape/temporaryScript code to KyraEngine_v2.
- Renamed newShape/temporaryScript code to animationScript.

svn-id: r31841
2008-05-03 19:23:45 +00:00
Johannes Schickel
416890722c Yet more opcodes moved to KyraEngine_v2.
svn-id: r31826
2008-05-02 16:03:53 +00:00
Johannes Schickel
b17c6e100e Started to move opcodes used in both kyra2 and kyra3 to KyraEngine_v2.
svn-id: r31825
2008-05-02 15:59:57 +00:00
Johannes Schickel
4b5f3266cf Started to refactor kyra2/kyra3 code to a common base. (regressions possible, compiling currently broken)
svn-id: r31817
2008-05-02 14:46:30 +00:00
Johannes Schickel
ec9a03964c - Renamed ScriptInterpreter -> EMCInterpreter
- Renamed ScriptState -> EMCState, ScriptData -> EMCData
- Removed 'Script' from function names inside EMCInterpreter
- Fixed KyraEngine::readSettings and KyraEngine::writeSettings for kyra3

svn-id: r31773
2008-04-29 15:12:09 +00:00
Johannes Schickel
f173041811 - moved kyra functor code to common/func.h
- adapted debugger code to use functor code from common/func.h
- adapted kyra engine to use functor code from common/func.h

svn-id: r31614
2008-04-20 15:47:11 +00:00
Johannes Schickel
7783b666c6 Fixed bad usage of functor objects.
svn-id: r31607
2008-04-20 15:16:58 +00:00
Johannes Schickel
bf46b5f178 - reworked tim handling
- moved tim interpreter to new class TIMInterpreter

svn-id: r31569
2008-04-19 13:52:09 +00:00
Florian Kagerer
1d086550a7 - complete support for the playable HOF demo
svn-id: r31560
2008-04-18 19:11:58 +00:00
Johannes Schickel
b54b9b34b4 - Updated debug output for KyraEngine::snd_playTheme
- cleanup

svn-id: r31464
2008-04-10 15:41:06 +00:00
Johannes Schickel
1c8aa0c807 Set opcode 31 (o2_limitMouseRrange) to o2_dummy for now.
Also added a comment about that.

svn-id: r31427
2008-04-06 14:16:27 +00:00
Johannes Schickel
2755727249 Cleanup.
svn-id: r31426
2008-04-06 14:13:14 +00:00
Johannes Schickel
22992f4aa5 Implemented opcode 33 o2_loadSoundfile.
svn-id: r31425
2008-04-06 14:11:43 +00:00
Johannes Schickel
21a66f12ba - Fixed HACKs in o2_getMusicDriver and o2_getSfxDriver
- Implemented missing bits in KyraEngine_v2::enterNewScene for MIDI (AdLib code still missing)
- Added music/sfx type to Sound class

svn-id: r31423
2008-04-06 13:32:41 +00:00
Johannes Schickel
5fd6af3071 Finished o2_delay implementation.
svn-id: r31284
2008-03-28 01:10:58 +00:00
Johannes Schickel
615a40d19c Oops fixed wrong o2_delaySecs.
svn-id: r31283
2008-03-28 01:07:16 +00:00
Johannes Schickel
98f9a47619 Implemented opcodes:
- 38: o2_countItemsInScene
 - 57: o2_setTimerDelay
 - 84: o2_getSceneExitToFacing
 - 137: o2_removeItemFromScene

svn-id: r31279
2008-03-28 00:13:43 +00:00
Johannes Schickel
72484b204b - Implemented opcodes:
-> 51: o2_getElapsedSecs
  -> 52: o2_getTimerDelay
- Added warnings to o2_delaySecs and o2_delay for unimplemented subfunctions

svn-id: r31277
2008-03-27 23:53:49 +00:00
Johannes Schickel
bf26f82cbb Implemented opcode 74: o2_setSceneAnimPos2.
svn-id: r31276
2008-03-27 23:46:30 +00:00
Johannes Schickel
7a683ae436 Implemented opcodes:
- 164: o2_getSfxDriver
 - 165: o2_getVocSupport
 - 166: o2_getMusicDriver

svn-id: r31275
2008-03-27 23:12:45 +00:00
Johannes Schickel
9eb279e1b6 Update hack comment in o2_updateSceneAnim.
svn-id: r31263
2008-03-27 14:55:52 +00:00
Johannes Schickel
57b80a79ab Fix for bug #1926838 "HoF: Animation plays too fast".
svn-id: r31262
2008-03-27 14:51:33 +00:00
Johannes Schickel
db1b4f0e14 - reworked skip flag handling in some places again
- hopefully fixed tons of warnings related to stackPosString

svn-id: r31253
2008-03-26 21:52:28 +00:00
Johannes Schickel
e962640411 Set delay time for the hack in o2_updateSceneAnim to the value Raziel^ suggests.
svn-id: r31251
2008-03-26 21:28:26 +00:00
Johannes Schickel
c9b9398561 Possible fix for part 1 of bug #1926547 "HoF: Right mouse button messes up gameplay".
svn-id: r31250
2008-03-26 21:24:22 +00:00
Johannes Schickel
c2df92a9b5 Added a simple hack which adds delay between animation frames of some scene animations, this prevents some animations from running too fast. See for example bug #1923638 "HoF: Marco missing animation frames".
svn-id: r31245
2008-03-26 19:58:33 +00:00
Johannes Schickel
07bb52b78e Fix for bug #1922521 "HoF: mountaineer sprite vanishes".
svn-id: r31217
2008-03-22 00:33:05 +00:00
Johannes Schickel
a169619526 - Implemented opcode 97: o2_isAnySoundPlaying
- reworked sound channel handling in HoF
  => fixed some voice related bugs

svn-id: r31209
2008-03-21 16:18:27 +00:00
Johannes Schickel
cc3b30d1cd Possible fix for graphics glitches when showing letters.
svn-id: r31199
2008-03-20 11:32:06 +00:00
Johannes Schickel
24fe9e42d7 - fixed numerous graphics glitches
-> fixed bug in o2_stopSceneAnimation
 -> fixed bug in KyraEngine_v2::freeSceneAnims

svn-id: r31196
2008-03-19 17:13:31 +00:00
Johannes Schickel
cbc4c789da Implemented showing of credits after completing game.
svn-id: r31186
2008-03-18 19:06:53 +00:00
Johannes Schickel
80a73d4ae6 Renamed opcode 95 to o2_showItemString.
svn-id: r31185
2008-03-18 18:20:13 +00:00
Johannes Schickel
9dc4bcb407 - Impelemented opcodes:
-> 95: o2_showPickUpString
  -> 107: o2_waitForConfirmationClick
  -> 161: o2_getRainbowRoomData
  -> 162: o2_drawSceneShapeEx
- Did I mention that HoF is completable now?

svn-id: r31184
2008-03-18 18:07:05 +00:00
Johannes Schickel
83390027c2 - Implemented opcodes:
-> 12: o2_setCharacterFacing
  -> 14: o2_moveCharacter
  -> 61: o2_loadZShapes
  -> 83: o2_setPathfinderFlag
  -> 90: o2_setSceneAnimPos
  -> 160: o2_updateTwoSceneAnims
- Implemented dino riding sequence
- Fixed bug in KyraEngine_v2::initSceneScreen which caused some gfx glitches

svn-id: r31183
2008-03-18 17:00:26 +00:00
Johannes Schickel
2af4fc1034 - 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
2008-03-18 15:50:43 +00:00
Johannes Schickel
8e98e35b56 Fixed bug in o2_setupSceneAnimation. (should fix some lockups)
svn-id: r31181
2008-03-18 14:27:22 +00:00
Florian Kagerer
68a603139d -missed animator_v2.cpp in last commit
svn-id: r31171
2008-03-17 23:45:33 +00:00
Florian Kagerer
760b44da10 - implement opcode 29: o2_drawShape
svn-id: r31170
2008-03-17 23:32:26 +00:00
Johannes Schickel
845d65d8b7 Implemented opcode 98: o2_setDeathHandlerFlag
svn-id: r31168
2008-03-17 23:27:33 +00:00
Johannes Schickel
1042c6dccf Implemented opcodes:
- 70: o2_backUpInventoryGfx
 - 71: o2_disableSceneAnim
 - 72: o2_enableSceneAnim
 - 73: o2_restoreInventoryGfx

svn-id: r31167
2008-03-17 23:01:50 +00:00
Johannes Schickel
8752939fe4 Implemented opcodes:
- 91: o2_blockInRegion
 - 92: o2_blockOutRegion

svn-id: r31166
2008-03-17 22:42:12 +00:00
Johannes Schickel
f6f61a5bc3 - Fixed opcode 115 (fixed dragon scene)
- renamed opcode 155 to o2_addToSceneAnimPosAndUpdate

svn-id: r31165
2008-03-17 22:32:30 +00:00
Florian Kagerer
d71523ae15 remove unnecessary code duplication
svn-id: r31163
2008-03-17 21:15:24 +00:00
Florian Kagerer
b9339221e4 - implement debugger commands: gamespeed and pass_codes
- implement opcode 151: meanWhileScene()
- fix dragon flight scene: this is still totally messed up, but at least the screen doesn't stay blank any more

svn-id: r31152
2008-03-17 01:34:24 +00:00
Johannes Schickel
6c672d92f0 Changed Kyra2 script debug printfs to be consistent with Kyra1 ones.
svn-id: r31150
2008-03-16 18:42:29 +00:00
Johannes Schickel
18fa238cd3 - implemented skip flag handling in wsa related opcodes
- implemented skip flag handling in o2_isVoicePlaying
- fixed skip flag handling when making the cauldron appear.

svn-id: r31149
2008-03-16 18:24:45 +00:00