Commit Graph

143 Commits

Author SHA1 Message Date
Johannes Schickel
b816a81c02 KYRA: More cleanup.
svn-id: r53699
2010-10-22 02:11:50 +00:00
Johannes Schickel
03e2d54ca7 KYRA: Adapt Kyra2+3 to use the newly added item type too.
svn-id: r53697
2010-10-22 02:10:22 +00:00
Johannes Schickel
38463e6161 KYRA: A little refactoring (name change).
svn-id: r53695
2010-10-22 02:08:26 +00:00
Johannes Schickel
9cd333152b KYRA: Add support for subtitle options changes via GMM.
svn-id: r51757
2010-08-05 14:41:00 +00:00
Johannes Schickel
0fe2ba6a0d Some more enforcement of our formatting conventions in KYRA too.
svn-id: r49069
2010-05-17 23:29:44 +00:00
Max Horn
a8cd7694cc Fix warnings about non-static const member in class without a constructor
svn-id: r44848
2009-10-09 21:36:09 +00:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
2009-10-04 21:26:33 +00:00
Johannes Schickel
eaca55ee50 Some fixes to comply with our coding guidelines.
svn-id: r44624
2009-10-04 17:54:08 +00:00
Johannes Schickel
64e6c596c7 Formatting.
svn-id: r40991
2009-05-29 12:52:03 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Johannes Schickel
696ed52959 Switched kyra1 to use the same input functionality as kyra2 and kyra3.
svn-id: r35393
2008-12-16 17:40:34 +00:00
Johannes Schickel
36de1204e3 - Implemented Engine::saveGameState for KYRA
- Changed internal save/load API to use slots instead of filename strings
- Changed internal save/load API to use Common::Error

svn-id: r34952
2008-11-09 13:00:40 +00:00
Johannes Schickel
f4fc8c3e4c Committed patch #2050337 "KYRA/SCUMM: Thumbnail support/improvement". (Without Max' compressed backward seeking support for now)
svn-id: r34053
2008-08-20 14:03:34 +00:00
Johannes Schickel
cef7d68fc5 Added support for Spanish fan translation of kyra3 (See fr #1994040 "KYRA3: Add support for Spanish fan translation").
svn-id: r32858
2008-06-30 23:39:56 +00:00
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
Johannes Schickel
1a52c5283a - Yet more opcodes moved to KyraEngine_v1
- Renamed some opcodes inside KyraEngine_LoK

svn-id: r32055
2008-05-12 12:57:42 +00:00
Johannes Schickel
574af78acb - Moved some opcodes to KyraEngine_v1
- Little variable renaming

svn-id: r32053
2008-05-12 12:42:10 +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
6e0c569966 Consisteny fixes:
- Renamed classes *_v1 -> *_LoK
 - Renamed files *_v1.* -> *_lok.*
 - Renamed WSAMovieV1 -> WSAMovie_v1
 - Renamed WSAMovieV2 -> WSAMovie_v2

svn-id: r32042
2008-05-11 22:32:37 +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
95a85a8984 Simplification in updateItemAnimations in KyraEngine_HoF and KyraEngine_MR.
svn-id: r31976
2008-05-10 17:41:34 +00:00
Florian Kagerer
8bbf257525 implement item animations for MR
svn-id: r31973
2008-05-10 14:12:48 +00:00
Johannes Schickel
5abc85bd0e Fixed possible crash in Debugger_v2 when using 'give'.
svn-id: r31907
2008-05-06 20:55:33 +00:00
Johannes Schickel
11f891963b Implemented Engine::getDebugger for KyraEngine.
svn-id: r31906
2008-05-06 20:50:27 +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
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
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
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
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
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
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
c841481aa3 Cleanup.
svn-id: r31674
2008-04-23 19:36:21 +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
bf46b5f178 - reworked tim handling
- moved tim interpreter to new class TIMInterpreter

svn-id: r31569
2008-04-19 13:52:09 +00:00