1066 Commits

Author SHA1 Message Date
Jordi Vilalta Prat
38a8aa516e Allow static and dynamic plugins to be used at the same time
svn-id: r31888
2008-05-06 03:00:26 +00:00
Johannes Schickel
0faf76bfac Removed delay from KyraEngine_MR::npcChatSequence, since it's doing delay script internally. This fixes some chat animation speeds.
svn-id: r31884
2008-05-05 21:57:26 +00:00
Johannes Schickel
874be3cfb4 Implemented opcode 91: o3_daggerWarning.
svn-id: r31882
2008-05-05 18:50:42 +00:00
Johannes Schickel
c26e62e288 - Implemented Kyra3 audio options menu, Helium mode still missing.
- Fixed unitialized variable

svn-id: r31881
2008-05-05 17:56:39 +00:00
Johannes Schickel
f42d222069 Got rid of some code duplication.
svn-id: r31880
2008-05-05 17:18:11 +00:00
Johannes Schickel
81cfd2a716 Implemented support for Kyra3 game options menu (including studio audience and skip flag options).
svn-id: r31879
2008-05-05 17:12:48 +00:00
Johannes Schickel
0f62fb0a88 - Little mouse visibility fix
- Cleanup

svn-id: r31878
2008-05-05 16:18:54 +00:00
Johannes Schickel
37459e6e75 - Fixed some palette fade times in Kyra3
- Changed behavior to match original when playing Kyra3 for the first time
- Fixed typo

svn-id: r31877
2008-05-05 16:14:45 +00:00
Johannes Schickel
2afff04468 - Added support for Kyra3 GUI (audio and game options not working yet)
- Added support for loading directly from command line for Kyra3

svn-id: r31876
2008-05-05 16:05:56 +00:00
Johannes Schickel
e45a9d42e2 - Shared checkInput code between kyra2 and kyra3
- Debugger related cleanup

svn-id: r31868
2008-05-04 15:56:28 +00:00
Johannes Schickel
c15ad0e373 Initial common base between kyra2 and kyra3 GUI code.
svn-id: r31867
2008-05-04 15:37:41 +00:00
Johannes Schickel
f71b4afcfa Renamed kyra2 and kyra3 gui files.
svn-id: r31866
2008-05-04 15:18:46 +00:00
Johannes Schickel
09b0f12852 Yet more opcodes moved to KyraEngine_v2.
svn-id: r31861
2008-05-04 13:25:03 +00:00
Johannes Schickel
7342629944 Cleanup.
svn-id: r31860
2008-05-04 13:11:17 +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
895adc75fa Cleanup.
svn-id: r31842
2008-05-03 19:32:45 +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
Kari Salminen
043f92cb23 Fix compilation on MSVC (Updated project files and turned a 'int forced to bool' warning off).
svn-id: r31840
2008-05-03 13:01:58 +00:00
Johannes Schickel
3aaff020c7 Fixed some valgrind warnings.
svn-id: r31839
2008-05-03 12:03:24 +00:00
Florian Kagerer
85f612076f fix bug in hof animator (incomplete initialization of _animObjects)
svn-id: r31835
2008-05-02 22:24:03 +00:00
Johannes Schickel
a829244b8c - Renamed ScreenAnimator -> Animator_v1
- Moved addItemToAnimList and deleteItemAnimEntry to KyraEngine_v2.

svn-id: r31831
2008-05-02 17:14:59 +00:00
Johannes Schickel
aaad3ccb3e Added missing file.
svn-id: r31828
2008-05-02 16:34:46 +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
8b899207d2 Moved runSceneScript6 to KyraEngine_v2.
svn-id: r31823
2008-05-02 15:48:30 +00:00
Johannes Schickel
5e4fceec2e Moved some character code from kyra2/kyra3 to KyraEngine_v2.
svn-id: r31822
2008-05-02 15:39:51 +00:00
Johannes Schickel
c6830b4138 - Renamed TextDisplayer_v2 to TextDisplayer_HoF
- Moved some character shape code to KyraEngine_v2

svn-id: r31821
2008-05-02 15:21:51 +00:00
Johannes Schickel
7566a12352 Moved common kyra2/kyra3 item to KyraEngine_v2.
svn-id: r31819
2008-05-02 15:08:45 +00:00
Johannes Schickel
52003bc195 Added missing files, compiling should work again.
svn-id: r31818
2008-05-02 14:48:19 +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
5bfc3170a3 Fixed some valgrind warnings.
svn-id: r31798
2008-05-01 22:42:05 +00:00
Florian Kagerer
c0db9c0d25 fix broken save file list
svn-id: r31796
2008-05-01 11:36:00 +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
ca7f7e2a3b Various cleanup.
svn-id: r31772
2008-04-29 14:33:29 +00:00
Johannes Schickel
4d5c6d1afb Prevent analog sound driver to be created for Kyra3.
svn-id: r31771
2008-04-29 14:22:04 +00:00
Johannes Schickel
a55d13e0a3 - Added volume param to KyraEngine::snd_playSoundEffect (0xFF per default as in original)
- Renamed KyraEngine_v3::playSoundEffect to KyraEngine_v3::snd_playSoundEffect
- Renamed KyraEngine_v3::playMusicTrack to KyraEngine_v3::snd_playWanderScoreViaMap
- Renamed KyraEngine_v3::o3_playMusicTrack to KyraEngine_v3::o3_playWanderScoreViaMap

svn-id: r31770
2008-04-29 14:08:08 +00:00
Filippos Karapetis
4893633ff5 Fixed MSVC warning
svn-id: r31768
2008-04-29 14:04:52 +00:00
Johannes Schickel
e588f9274e - Implemented credits showing after finishing game
- Fixed bug with good conscience displaying in conscience selection scene

svn-id: r31767
2008-04-28 21:32:23 +00:00
Johannes Schickel
43c10a8cc8 - Fixed some delay times
- Implemented opcodes:
 -> 99: o3_showGoodConscience
 -> 100: o3_goodConscienceChat
 -> 101: o3_hideGoodConscience

svn-id: r31766
2008-04-28 20:45:22 +00:00
Johannes Schickel
37fb65ea3c Fixed bug in KyraEngine_v3::processDialog, should fix crash when talking to Bill in hell.
svn-id: r31764
2008-04-28 20:09:54 +00:00
Johannes Schickel
7577e7548c Fixed bug in TimerManager::update, this should fix tic-tac-toe game in kyra3.
svn-id: r31763
2008-04-28 19:51:34 +00:00
Johannes Schickel
d02503761c Implemented opcodes:
- 82: o3_getShapeFlag1
 - 122: o3_setConversationState
 - 125: o3_getConversationState

svn-id: r31761
2008-04-28 19:16:45 +00:00
Johannes Schickel
018b82b51e Fixed bug in KyraEngine_v3::updateCharPal, should fix malcolms palette in scene 42.
svn-id: r31760
2008-04-28 19:03:11 +00:00
Johannes Schickel
bd067bffe9 Fixed bug while loading savegame.
svn-id: r31754
2008-04-27 14:33:03 +00:00
Johannes Schickel
77bae01195 - Fixed bug in itemInventoryMagic
- Fixed original game bug when creating item 7 (Bent nail-on-a-string), now it should award points when creating it with scene item and also in french version when creating it in inventory

svn-id: r31753
2008-04-27 14:03:51 +00:00
Johannes Schickel
7eef01cec4 Moved newShape code to sequences_v3.cpp
svn-id: r31752
2008-04-27 12:40:56 +00:00
Johannes Schickel
1aac349da4 Implemented KyraEngine_v3::eelScript.
svn-id: r31751
2008-04-27 12:39:16 +00:00
Johannes Schickel
1d167da633 - Implemented opcodes
-> 57: o3_makeSecondChanceSave
  -> 98: o3_setDeathHandler
- Made game automatically reload second chance save on death for now

svn-id: r31749
2008-04-27 00:50:13 +00:00