Commit Graph

152 Commits

Author SHA1 Message Date
Johannes Schickel
18b3e3a4ba - Added a simple (but yet better) implementation of pauseEngineIntern for Kyra_v1 and Kyra_v2
- Added comments about what game specific details are missing in the pause implementation

svn-id: r32231
2008-05-23 13:37:56 +00:00
Johannes Schickel
74311906f2 Cleanup.
svn-id: r32176
2008-05-18 21:11:19 +00:00
Florian Kagerer
231ef79de2 fix engine destructor for non interactive hof demo
svn-id: r32093
2008-05-13 21:39:18 +00:00
Johannes Schickel
bb03596744 - Renamed KyraEngine to KyraEngine_v1
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp

svn-id: r32044
2008-05-11 23:16:50 +00:00
Johannes Schickel
35cc3a3d19 Committed slightly modified patch #1961830 "KYRA: Scroll wheel support for Kyra 2 and 3".
svn-id: r32016
2008-05-11 11:35:12 +00:00
Johannes Schickel
d21d9858fd - Cleaned up main menu quit handling
- Moved KyraEngine_HoF delay implementation to KyraEngine_v2

svn-id: r31987
2008-05-10 19:41:26 +00:00
Johannes Schickel
5082419fe9 Fixed bug in Screen_v2::makeShapeCopy.
svn-id: r31986
2008-05-10 19:29:13 +00:00
Johannes Schickel
3d9ea59616 Changed kyra to use delete[] instead of delete [].
svn-id: r31925
2008-05-07 14:20:37 +00:00
Johannes Schickel
11f891963b Implemented Engine::getDebugger for KyraEngine.
svn-id: r31906
2008-05-06 20:50:27 +00:00
Johannes Schickel
3e7f66da89 Cleanup.
svn-id: r31905
2008-05-06 17:44:00 +00:00
Johannes Schickel
2976f961fe - Fixed some memory leaks in kyra3
- Fixed valgrind warnings in GUI_v2 code

svn-id: r31902
2008-05-06 16:57:07 +00:00
Johannes Schickel
874be3cfb4 Implemented opcode 91: o3_daggerWarning.
svn-id: r31882
2008-05-05 18:50:42 +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
09b0f12852 Yet more opcodes moved to KyraEngine_v2.
svn-id: r31861
2008-05-04 13:25:03 +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
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
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
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
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
Johannes Schickel
61101b6dce Fixed kyra screen initialization.
svn-id: r31730
2008-04-26 10:15:54 +00:00
Jonathan Gray
0bb41c23ca Call _screen->Init(). Fixes segfaults when
trying to start via a command line.

svn-id: r31729
2008-04-26 09:52:17 +00:00
Johannes Schickel
c841481aa3 Cleanup.
svn-id: r31674
2008-04-23 19:36:21 +00:00
Johannes Schickel
69bdd29976 - Implemented idle animation/talk handling in kyra3
- Implemented opcodes: 110: o3_runTemporaryScript
- fixed idle animation handling in kyra2

svn-id: r31673
2008-04-23 19:24:02 +00:00
Johannes Schickel
6ca9b8f91d - Fixed possible memory leak.
- Corrected processNewShape implementation.

svn-id: r31671
2008-04-23 18:57:21 +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
Johannes Schickel
991a977990 Cleanup.
svn-id: r31495
2008-04-12 23:59:11 +00:00
Johannes Schickel
1f91dc0384 - some refactoring for Kyra3
- removed unneeded map code in KyraEngine_v3

svn-id: r31488
2008-04-12 23:17:21 +00:00
Johannes Schickel
50c3732478 - Set language to Common::UNK_LANG for multilanguage games (kyra2cd and kyra3) in detection code
- Save language changes done in menu in HoF to the config file

svn-id: r31454
2008-04-08 18:52:27 +00:00
Johannes Schickel
4b58a431da Implemented support for Towns (and hopefully DOS floppy too) menus.
svn-id: r31438
2008-04-06 16:54:51 +00:00
Johannes Schickel
213ac50740 Oops. that shouldn't have been reverted by last committ.
svn-id: r31433
2008-04-06 15:05:12 +00:00
Florian Kagerer
22efb801d4 svn-id: r31431 2008-04-06 14:57:01 +00:00
Johannes Schickel
bf5840f587 Fixed crash on startup when running japanese versions of Kyrandia.
svn-id: r31428
2008-04-06 14:41:25 +00:00
Johannes Schickel
4f71d3814c Fixed various bugs in GUI_v2::processButtonList.
This fixes bugs:
 - #1935827 "HoF: Buttons pressed state not available"
 - #1935219 "HoF: artefact after loading game"

svn-id: r31422
2008-04-06 13:06:05 +00:00
Johannes Schickel
b99d5603cf - Changed quicksaves to use slots 990-998.
- Made slots 990-999 not writeable for savegames via menu.
- Temporary save in HoF now uses slot 999.

svn-id: r31400
2008-04-05 03:03:10 +00:00
Johannes Schickel
0aecc4fb03 Implemented game options menu.
svn-id: r31378
2008-04-04 08:13:35 +00:00
Florian Kagerer
834badfc95 cleanup
svn-id: r31374
2008-04-04 01:43:20 +00:00
Johannes Schickel
4fa0740a27 Implemented death menu. This also fixes bug #1926892 "HoF: Odd behaviour when Zanthia gets killed(?)".
svn-id: r31360
2008-04-02 03:16:34 +00:00
Johannes Schickel
bd85909ff9 Don't enter run loop when quit flag is set.
svn-id: r31337
2008-03-30 18:41:55 +00:00
Johannes Schickel
f4e6109b33 - fixed savegame description loading in kyra1
- added Kyra2 load menu, currently just accessable from startup menu though

svn-id: r31331
2008-03-30 18:27:46 +00:00
Johannes Schickel
7605a9a517 Changed HoF GUI code to use common GUI code now.
svn-id: r31295
2008-03-28 16:15:00 +00:00
Johannes Schickel
f7d14259c9 Implemented command text fadeout.
svn-id: r31285
2008-03-28 01:28:02 +00:00
Johannes Schickel
c5929561ba - Clear input queue after loading game via hotkeys.
- Fixed bug which caused the need for clicking twice to change pages in spellbook.

svn-id: r31282
2008-03-28 01:03:54 +00:00