libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 01:39:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,556 Commits 5 Branches 5 Tags 1.8 GiB
1509a17d3a
Commit Graph

1169 Commits

Author SHA1 Message Date
Johannes Schickel
13b60eeb32 Don't restart music while changing music volume in Hof and MR. 
svn-id: r32069
 2008-05-12 19:29:14 +00:00
Johannes Schickel
08c601ad97 Yet another valgrind warning fixed. 
svn-id: r32067
 2008-05-12 17:46:15 +00:00
Johannes Schickel
de6e6408b6 Fixed some valgrind warnings. 
svn-id: r32065
 2008-05-12 17:23:28 +00:00
Johannes Schickel
289f96d37c More naming consistency fixes (fixes old TODO). 
svn-id: r32062
 2008-05-12 14:52:18 +00:00
Florian Kagerer
bde4fa1e9b fix for kyra 3 sfx (broken by last commit) 
svn-id: r32061
 2008-05-12 14:22:27 +00:00
Johannes Schickel
0b9a3f2208 Added assert to snd_playSoundEffect. 
svn-id: r32060
 2008-05-12 13:50:59 +00:00
Florian Kagerer
771854bdd9 move some kyra 3 static resources to kyra.dat 
svn-id: r32058
 2008-05-12 13:35:58 +00:00
Johannes Schickel
4db0bd9046 Two more KyraEngine_LoK opcodes renamed. 
svn-id: r32057
 2008-05-12 13:19:11 +00:00
Johannes Schickel
56d2603d4f - Some more opcodes moved to KyraEngine_v1 
- Yet more naming consistency fixes

svn-id: r32056
 2008-05-12 13:11:42 +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
279987c181 Oops forgot to commit module.mk 
svn-id: r32054
 2008-05-12 12:43:52 +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
Torbjörn Andersson
65e41486f4 Added do { ... } while (0) to the GUI_V* macros, so that they will work as 
expected if, for instance, someone writes "if (...) GUI_V1_MENU_ITEM( ... );"
I don't expect anyone will want to write statements like that, but just to
avoid nasty surprises...

svn-id: r32049
 2008-05-12 04:33:30 +00:00
Torbjörn Andersson
3763c2799d Renamed preprocessor constants to match file names. 
svn-id: r32047
 2008-05-12 04:17:51 +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
1d018f6046 Formatting. 
svn-id: r32037
 2008-05-11 21:09:16 +00:00
Johannes Schickel
4b21c2958d Implemented helium mode support for Kyra3. 
svn-id: r32028
 2008-05-11 17:50:13 +00:00
Johannes Schickel
825e3b5136 - Added support for original kyra3 save files 
- Added TalkObject::sceneId in savegames

svn-id: r32027
 2008-05-11 17:20:23 +00:00
Johannes Schickel
a6ccfa4f09 Added saving of current album page of kyra3 like the original did. 
svn-id: r32025
 2008-05-11 16:56:19 +00:00
Johannes Schickel
61a105c9ba Updated pathfinder debug output. 
svn-id: r32024
 2008-05-11 16:48:54 +00:00
Johannes Schickel
35d01db1aa Implemented page switch animation in kyra3 album. 
svn-id: r32023
 2008-05-11 15:57:50 +00:00
Johannes Schickel
4932660f13 - Implemented kyra3 album (page switch animation not yet implemented) 
- Implemented opcode 25: o3_showAlbum

svn-id: r32022
 2008-05-11 15:24:25 +00:00
Florian Kagerer
5f9c533446 stop music playback when skipping (parts of) the HOF intro 
svn-id: r32019
 2008-05-11 12:58:54 +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
Torbjörn Andersson
d7fc8fd7be Use less CPU when reading the spell book. 
svn-id: r32009
 2008-05-11 10:48:22 +00:00
Torbjörn Andersson
b2defd0eac Fixed warning. 
svn-id: r31988
 2008-05-10 19:57:49 +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
7c7e9b831f Implemented pausing of timers, this should fix some minor glitches. 
svn-id: r31985
 2008-05-10 19:20:38 +00:00
Johannes Schickel
f930fff0d1 Set _quitFlag when receiving quit event in kyra2/kyra3 main menu. 
svn-id: r31984
 2008-05-10 18:56:00 +00:00
Johannes Schickel
a00df8dff1 Renamed opcode 163: o2_getBoolFromStack to o2_midiSoundFadeout and updated implementation. 
svn-id: r31981
 2008-05-10 18:39:03 +00:00
Johannes Schickel
9b2c63550f Implemented opcode 106: o2_playFireflyScore. 
svn-id: r31980
 2008-05-10 18:30:20 +00:00
Johannes Schickel
8d6048a9fa - Added small delay to GUI_v2::getInput 
- Prevent kyra3 background music from stopping while menu is open

svn-id: r31979
 2008-05-10 18:23:11 +00:00
Johannes Schickel
6b51580bb1 Consume less cpu time when Zanthia/Malcolm are walking. 
svn-id: r31978
 2008-05-10 18:14:57 +00:00
Florian Kagerer
3ee96f2fe3 fix missing animation for golden neck ring 
svn-id: r31977
 2008-05-10 17:51:57 +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
870a330c66 (hopefully) fix bug in last commit 
svn-id: r31975
 2008-05-10 15:31:11 +00:00
Florian Kagerer
8bbf257525 implement item animations for MR 
svn-id: r31973
 2008-05-10 14:12:48 +00:00
Johannes Schickel
a83d79bafd Fixed typos. 
svn-id: r31965
 2008-05-09 13:33:31 +00:00
Johannes Schickel
bdadf34f16 Implemented opcode 66: o3_removeItemSlot. 
svn-id: r31957
 2008-05-08 22:10:34 +00:00
Johannes Schickel
b53fe83695 Silenced some g++ 4.3 warnings. 
svn-id: r31956
 2008-05-08 21:23:14 +00:00
Johannes Schickel
e0689193ef Fixed bug in o3_updateConversations. 
svn-id: r31955
 2008-05-08 20:55:39 +00:00
Johannes Schickel
627d30d389 Fixed bug when starting new game from load menu. 
svn-id: r31935
 2008-05-07 22:48:44 +00:00
Johannes Schickel
a7320fb4dc Implemented KyraEngine_MR::timerFleaDeath. 
svn-id: r31934
 2008-05-07 21:12:26 +00:00
Florian Kagerer
37c04c28a8 Fix invalid memory access bug in the library sequence (original static data seems to be bugged here) 
svn-id: r31933
 2008-05-07 21:04:06 +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
10b73b474f Fixed crash when qutting kyra2 main menu. 
svn-id: r31909
 2008-05-06 22:05:26 +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
3e7f66da89 Cleanup. 
svn-id: r31905
 2008-05-06 17:44:00 +00:00
Johannes Schickel
2ee01bf757 - Fixed valgrind warnings in HoF 
- Fixed memory leaks in HoF

svn-id: r31903
 2008-05-06 17:30:31 +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
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