libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-02 07:28:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,749 Commits 5 Branches 5 Tags 1.8 GiB
91df44f8f6
Commit Graph

1291 Commits

Author SHA1 Message Date
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
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
Johannes Schickel
d49dd4e2fa Renamed some kyra3 variables to match kyra2/kyra1 names. 
svn-id: r31748
 2008-04-27 00:42:17 +00:00
Johannes Schickel
78ee2e449e Implemented (quick-)save/load support for kyra3. 
svn-id: r31747
 2008-04-27 00:38:01 +00:00
Johannes Schickel
f6e622e303 Cleanup. 
svn-id: r31745
 2008-04-26 23:43:12 +00:00
Johannes Schickel
9b3edffa8d Implemented opcodes: 
- 74: o3_setSceneAnimPosAndFrame
 - 81: o3_switchScene

svn-id: r31744
 2008-04-26 23:26:47 +00:00
Johannes Schickel
567c731235 Added code to play VQA files when entering new scenes. 
svn-id: r31743
 2008-04-26 23:01:06 +00:00
Johannes Schickel
c0f4b3faa7 - load new tlk file on chapter change 
- added warning when trying to play non-existent soundfile

svn-id: r31742
 2008-04-26 22:53:00 +00:00
Johannes Schickel
b179320edf Implemented opcode 34: o3_resetInventory. 
svn-id: r31741
 2008-04-26 22:33:07 +00:00
Johannes Schickel
99307976d5 Finished o3_delay implementation. 
svn-id: r31740
 2008-04-26 22:30:55 +00:00
Johannes Schickel
dd98898a23 Implemented opcodes: 
- 78: o3_disableInventory
 - 79: o3_enableInventory

svn-id: r31739
 2008-04-26 22:29:27 +00:00
Johannes Schickel
71f4dee9ae Implemented opcode 129 o3_chapterChange. 
svn-id: r31738
 2008-04-26 22:22:21 +00:00
Johannes Schickel
6ed2d9c287 Implemented opcodes: 
- 26: o3_setInventorySlot
 - 27: o3_getInventorySlot
 - 28: o3_addItemToInventory

svn-id: r31737
 2008-04-26 22:13:19 +00:00
Johannes Schickel
fa208a4386 - Implemented support for jesters staff, mood change and score displaying 
- Fixed bug in KyraEngine_v3::loadMalcolmShapes

svn-id: r31736
 2008-04-26 21:52:15 +00:00
Johannes Schickel
7eef295729 Added support for kyra3 inventory. (jesters staff not supported yet) 
svn-id: r31735
 2008-04-26 21:08:47 +00:00
Johannes Schickel
2ae81f0096 Implemented opcodes: 
- 76: o3_removeItemInstances
 - 94: o3_showSceneStringsMessage

svn-id: r31733
 2008-04-26 19:00:22 +00:00
Johannes Schickel
3bde19a137 Fixed unitialized variable in Screen. 
svn-id: r31732
 2008-04-26 10:28:23 +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
Florian Kagerer
13ef28215d minor drawShape() bug fix for Malcolm's shadow 
svn-id: r31728
 2008-04-25 22:38:40 +00:00
Johannes Schickel
7fb4a87c24 Implemented opcodes: 
- 20: o3_setCharacterAnimFrameFromFacing
 - 61: o3_disguiseMalcolm

svn-id: r31727
 2008-04-25 17:59:38 +00:00
Johannes Schickel
c10f59d358 Implemented opcodes: 
- 152: o3_customChat
 - 153: o3_customChatFinish

svn-id: r31726
 2008-04-25 17:43:40 +00:00
Johannes Schickel
2479b03fbf Implemented opcodes: 
- 156: o3_disableTimer
 - 157: o3_enableTimer
 - 158: o3_setTimerCountdown

svn-id: r31725
 2008-04-25 17:36:43 +00:00
Johannes Schickel
66518b5be0 Oops... fixes compiling. 
svn-id: r31724
 2008-04-25 16:09:30 +00:00
Johannes Schickel
3150313377 - Committed slightly modified patch #1951735 "kyra3: debugger and "give" command" 
- Added some more commands to new kyra3 debugger
- Cleaned up some debugger code

svn-id: r31723
 2008-04-25 16:02:20 +00:00
Johannes Schickel
671e475567 Implmented opcodes: 
- 11: o3_getCharacterFrameFromFacing
 - 12: o3_setCharacterFacingOverwrite

svn-id: r31722
 2008-04-25 15:46:07 +00:00
Johannes Schickel
425c874816 - Implemented opcodes: 
-> 30: o3_addItemToCurScene
  -> 62: o3_drawSceneShape
- Fixed bug in KyraEngine_v3::exchangeMouseItem, fixes user input after combining items

svn-id: r31721
 2008-04-25 15:41:06 +00:00
Johannes Schickel
fd5064b069 Renamed opcode 63 to o3_drawSceneShapeOnPage. 
svn-id: r31720
 2008-04-25 12:20:06 +00:00
Johannes Schickel
c05d16826d - implemented opcode 90: o3_getScore 
- opcode 103 is yet another dummy opcode

svn-id: r31710
 2008-04-24 21:48:04 +00:00
Johannes Schickel
a546869dac Implemented opcode temporary 4: o3t_setNewShapeFlag. 
svn-id: r31709
 2008-04-24 21:38:08 +00:00
Johannes Schickel
2b9a786e79 Opcode 53 is o3_playSoundEffect. 
svn-id: r31708
 2008-04-24 21:34:07 +00:00
Johannes Schickel
44d44ddf05 Added screen update in KyraEngine_v3::drawScoreCounting. 
svn-id: r31707
 2008-04-24 21:27:27 +00:00
Johannes Schickel
18dde5420c Fixed hand item reset on scene enter. 
svn-id: r31706
 2008-04-24 21:20:32 +00:00
Johannes Schickel
f0cbfff93e Implemented opcode 60: o3_removeItemsFromScene. 
svn-id: r31705
 2008-04-24 21:18:10 +00:00
Johannes Schickel
1c660c4524 Implemented opcode 56: o3_updateScore. 
svn-id: r31704
 2008-04-24 21:11:55 +00:00
Johannes Schickel
103e944fa4 Output error message when kyra.dat initialization fails because of old version or missing entries. 
svn-id: r31695
 2008-04-24 15:49:41 +00:00
Johannes Schickel
b50948b60c Fixed bug in loadMalcolmShapes. 
svn-id: r31694
 2008-04-24 15:04:12 +00:00
Johannes Schickel
551bd59fa8 Implemented opcodes: 
- 15: o3_setCharacterFacing
 - 107: o3_waitForConfirmationClick

svn-id: r31690
 2008-04-24 13:57:55 +00:00
Johannes Schickel
37d21cab59 Implemented special item string selection for french version of Kyra3. 
svn-id: r31689
 2008-04-24 13:27:05 +00:00
Johannes Schickel
caa7a4787c Fixed command line string when picking up item. 
svn-id: r31688
 2008-04-24 13:16:46 +00:00
Johannes Schickel
e360eb13f8 Fixed bug in checkCharCollision. 
svn-id: r31687
 2008-04-24 13:14:39 +00:00
Johannes Schickel
ffc1e56cbd More kyra3 item drop down code. 
svn-id: r31685
 2008-04-24 13:05:14 +00:00
Johannes Schickel
6562a7cd8a Implemented parts of item drop down code for Kyra3. 
svn-id: r31681
 2008-04-23 22:53:19 +00:00
Johannes Schickel
68613025ab Cleanup. (and little addition to showInventory) 
svn-id: r31679
 2008-04-23 21:07:58 +00:00
Johannes Schickel
c3cec1926f Implmenented inventory show/hide. 
svn-id: r31676
 2008-04-23 20:50:31 +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
347eb2dc07 - cleanup 
- some valgrind warning fixes

svn-id: r31669
 2008-04-23 18:18:11 +00:00
Johannes Schickel
79d6c9f042 - Implemented opcode: 14: o3_moveCharacter 
- Fixed opcode 44 and renamed it to o3_handItemSet, this fixes loads of input and enter scene facing problems.

svn-id: r31665
 2008-04-23 17:08:34 +00:00
Johannes Schickel
5572f694c0 Implemented opcodes: 
- 8: o3_getMalcolmsSpirit
 - 52: o3_setMalcolmsSpirit
 - 65: o3_updateConversations
 - 117: o3_runDialog

svn-id: r31664
 2008-04-23 16:06:33 +00:00
Johannes Schickel
d20dc45072 Implemented opcode 118: o3_malcolmRandomChat. 
svn-id: r31662
 2008-04-23 14:20:34 +00:00
Johannes Schickel
18ed600abe Implemented some kyra3 dialog support. 
- Room enter talks by malcolm should be working now
 - Zanthia should say now some lines after landing

svn-id: r31660
 2008-04-22 22:36:09 +00:00
Johannes Schickel
8a18ddb3ca Implemented opcodes: 
- 32: o3_setHandItem
 - 33: o3_removeHandItem
 - 50: o3_wipeDownMouseItem
 - 116: o3_runActorScript
 - 136: o3_countItemInstances

svn-id: r31657
 2008-04-22 18:08:56 +00:00
Max Horn
e31e1ff02c Removed unnecessary #include 
svn-id: r31646
 2008-04-21 17:08:34 +00:00
Johannes Schickel
6aec012921 Simplified Kyra3 TLK loading. 
svn-id: r31634
 2008-04-20 23:38:19 +00:00
Johannes Schickel
9616ec94c9 Fixed yet another two long standing bugs in Screen::encodeShape. 
svn-id: r31633
 2008-04-20 23:13:38 +00:00
Johannes Schickel
87f10ebe40 Committed patch removing Audio::Mixer::SoundType alias in Kyra::SoundDigital. 
svn-id: r31632
 2008-04-20 22:24:24 +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
d484c7ed43 Improved sound priority handling. 
svn-id: r31598
 2008-04-20 14:36:39 +00:00
Johannes Schickel
96fd18a13b Implemented sound priority handling. 
svn-id: r31597
 2008-04-20 14:25:37 +00:00
Johannes Schickel
cdfcab9315 Implemented opcodes: 
- 6: o3_getCharacterFacing
 - 7: o3_getCharacterScene
 - 13: o3_trySceneChange
 - 32: o3_checkForItem
 - 46: o3_addSpecialExit
 - 63: o3_drawSceneShape
 - 75: o3_update
 - 80: o3_enterNewScene
 - 86: o3_setMalcolmPos
 - 154: o3_setupSceneAnimObject

svn-id: r31596
 2008-04-20 13:44:44 +00:00
Johannes Schickel
78c675278b Implemented opcodes: 
- 64: o3_checkInRect
 - 87: o3_stopMusic
 - 88: o3_playMusicTrack

svn-id: r31595
 2008-04-20 12:34:16 +00:00
Johannes Schickel
e1ef6c9e9d Fixed bug in getCharLength. 
svn-id: r31594
 2008-04-20 11:59:22 +00:00
Johannes Schickel
01bbe8cb6c Fixed long standing bug in encodeShape. 
svn-id: r31593
 2008-04-20 11:52:08 +00:00
Johannes Schickel
a329be773e - Fixed some valgrind warnings. 
- Little bugfix for scene shape loading.

svn-id: r31591
 2008-04-20 10:39:39 +00:00
Torbjörn Andersson
8cbd185731 Use correct (I hope) size when loading TLK files. The size field in the AUD 
header does not count the size of the header itself. (This fixes a failed
assertion when entering the Pegasus Landing in Kyrandia 3.)

svn-id: r31590
 2008-04-20 07:44:27 +00:00
Johannes Schickel
913f40688a Added some more opcodes. 
svn-id: r31589
 2008-04-20 02:22:08 +00:00
Johannes Schickel
2db899d1c7 - fixed various glitches 
- implemented some input code for kyra3

svn-id: r31588
 2008-04-20 02:11:10 +00:00
Johannes Schickel
24e3ba7154 Added missing file sequences_v3.cpp. 
svn-id: r31587
 2008-04-20 00:41:00 +00:00
Johannes Schickel
733676033a Fixed bug in playStudioSFX. 
svn-id: r31586
 2008-04-20 00:32:39 +00:00
Johannes Schickel
fb02a030a5 Implemented opcode 49: o3_badConscienceChat. 
svn-id: r31585
 2008-04-20 00:30:39 +00:00
Johannes Schickel
6692c4613d Implemented opcodes: 
- 21: o3_showBadConscience
 - 23: o3_hideBadConscience

svn-id: r31584
 2008-04-20 00:11:42 +00:00
Johannes Schickel
2de46c5e80 Oops forgot to update assert last commit. 
svn-id: r31583
 2008-04-19 22:26:22 +00:00
Johannes Schickel
663ae01474 Fixed Zanthia chat script selection. 
svn-id: r31582
 2008-04-19 22:25:22 +00:00
Johannes Schickel
03caed6ce3 Implemented some kyra opcodes and some chat handling code, now Malcolm should say something after crawling out of the dump. 
svn-id: r31581
 2008-04-19 22:22:00 +00:00
Johannes Schickel
4f4eb8d771 One more valgrind warning fix. 
svn-id: r31580
 2008-04-19 17:17:48 +00:00
Johannes Schickel
84b9c58924 Added some comment about palette setting in KyraEngine_v3::playVQA. 
svn-id: r31579
 2008-04-19 15:37:59 +00:00
Johannes Schickel
82a35bb87b Added fade to black/music fadeout when starting kyra3. 
svn-id: r31578
 2008-04-19 15:04:59 +00:00
Johannes Schickel
960655eec5 Fixed formatting. 
svn-id: r31577
 2008-04-19 14:52:35 +00:00
Florian Kagerer
8711a48de3 fix detection for playable Hof demo 
svn-id: r31576
 2008-04-19 14:48:29 +00:00
Johannes Schickel
ceb46a38cd Changed KyraEngine_v1::setupSceneResource to use Resource::exists instead of Common::File::exists. 
svn-id: r31575
 2008-04-19 14:44:06 +00:00
Johannes Schickel
a922069eae Ops isInPakList behavior was still not quite correct. Fixed bug with embedded pak files. 
svn-id: r31574
 2008-04-19 14:40:37 +00:00
Johannes Schickel
1d6af7b502 Fixed Resource::isInPakList behavior. 
svn-id: r31573
 2008-04-19 14:36:26 +00:00
Johannes Schickel
7e12a50bed - some minor renaming in TIM code 
- added exists function to Resource
- started to add checks via exists to assure that important files are present

svn-id: r31572
 2008-04-19 14:31:10 +00:00
Johannes Schickel
49cf8237f0 Renamed function for consistency. 
svn-id: r31571
 2008-04-19 14:00:14 +00:00
Johannes Schickel
a79c91b7d0 Added some asserts to prevent out of bounds access. 
svn-id: r31570
 2008-04-19 13:58:32 +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
5b742734ab Oops... 
svn-id: r31567
 2008-04-18 22:24:39 +00:00
Johannes Schickel
0824721746 Cleanup. 
svn-id: r31566
 2008-04-18 22:23:31 +00:00
Johannes Schickel
2fe0988d27 Fixed mismatching operator delete. 
svn-id: r31565
 2008-04-18 21:44:55 +00:00
Johannes Schickel
07ef82c26a Fixed some valgrind warnings. 
svn-id: r31564
 2008-04-18 21:41:55 +00:00
Torbjörn Andersson
0dac6c8f85 Fixed a Valgrind warning. I hope this is what the function was intended to do. 
svn-id: r31563
 2008-04-18 19:33:06 +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
ba90659705 Some kyra1 menu tweaking, now all languages should use the same clean layout instead of variable width button system (widths even changed at runtime, which looked rather strange). 
svn-id: r31559
 2008-04-18 15:58:49 +00:00
Johannes Schickel
7d6a349afa Fixed displaying text speed settings in CD version. 
svn-id: r31558
 2008-04-18 15:05:46 +00:00
Johannes Schickel
4b7e5aeaf7 Little fix in drawShape. 
svn-id: r31555
 2008-04-17 22:50:15 +00:00
Johannes Schickel
7666531dac Fixed setShapePages maxY default value. 
svn-id: r31554
 2008-04-17 22:07:17 +00:00
Johannes Schickel
0f15067004 Cleanup. 
svn-id: r31549
 2008-04-17 18:00:48 +00:00
Johannes Schickel
eb2ffce2fd Implemented volume handling for SFX. 
svn-id: r31548
 2008-04-17 17:57:16 +00:00
Johannes Schickel
0f34c16c1e Cleanup. 
svn-id: r31547
 2008-04-17 17:49:18 +00:00
Johannes Schickel
87256747b1 Implemented sfx support for Kyra3. 
svn-id: r31546
 2008-04-17 17:46:39 +00:00
Johannes Schickel
75641c405e Fixed gcc warning. 
svn-id: r31543
 2008-04-17 17:16:52 +00:00
Johannes Schickel
710976824e Fixed Kyra 3 TLK file loading. 
svn-id: r31541
 2008-04-17 16:55:13 +00:00
Johannes Schickel
6cd8eda9bd Implemented support for Kyra3 TLK files. 
svn-id: r31540
 2008-04-17 16:38:26 +00:00
Torbjörn Andersson
7ec2b87fb6 Commented out unused variables. 
svn-id: r31539
 2008-04-17 16:35:16 +00:00
Johannes Schickel
7b56734708 Properly implemented KyraEngine_v3::lineIsPassable. 
svn-id: r31538
 2008-04-17 15:39:34 +00:00
Johannes Schickel
66328be342 Added partial implementation of updateMouse cursor. 
svn-id: r31537
 2008-04-17 15:29:10 +00:00
Johannes Schickel
4685cc047d Implemented kyra3 timer code. 
svn-id: r31536
 2008-04-17 14:26:50 +00:00
Johannes Schickel
a2cdc5e393 - fixed bug in script interpreter code (could've also affected HoF) 
- some more Kyra3 code:
  -> start sequence should show up now partially
  -> fixed a scene animation related bug
  -> a few more opcodes

svn-id: r31535
 2008-04-17 13:38:44 +00:00
Johannes Schickel
7745100b8d - minor cleanup in script.cpp 
- fix for memory leak in Kyra3
- fixed enterNewSceneUnk2

svn-id: r31534
 2008-04-17 11:59:20 +00:00
Florian Kagerer
607039db01 some more drawShape plot functions now (after Lord Hoto's additions) required for Kyra 1 
svn-id: r31528
 2008-04-17 06:33:48 +00:00
Torbjörn Andersson
09d468e884 Fixed another warning, so that I can steal some of LordHoto's Kyra 3-related 
glory and make it my own. ;-)

svn-id: r31525
 2008-04-16 23:12:15 +00:00
Johannes Schickel
b2331a01ec Fixed mask page handling in ScreenEx::copyWsaRect, this time it should be correct... 
svn-id: r31524
 2008-04-16 23:11:46 +00:00
Johannes Schickel
2b87cd1fa9 - Some more mask page handling fixes for Kyra3. 
- Implemented a few scene animation opcodes
- basic run loop (all the user can do is quit though)
- music related fix
Wee you can see the squirrel animation and listen to the music now!

svn-id: r31523
 2008-04-16 23:09:07 +00:00
Torbjörn Andersson
ac25887670 Fixed warning. 
svn-id: r31522
 2008-04-16 22:30:13 +00:00
Johannes Schickel
b2a586acb2 Fixed shape drawing in HoF (regression) and Kyra3. 
svn-id: r31521
 2008-04-16 22:23:09 +00:00
Johannes Schickel
e463ac0367 Fixed Malcolm upside down bug. 
svn-id: r31520
 2008-04-16 21:17:23 +00:00
Johannes Schickel
57e91a6add Some more kyra3 code. 
svn-id: r31519
 2008-04-16 21:13:52 +00:00
Johannes Schickel
d3fe051274 Some more kyra3 code. This should show the first scene for a brief second. (and it initializes a bit more internal stuff) 
svn-id: r31518
 2008-04-16 20:28:27 +00:00
Florian Kagerer
00dde660e3 fix sjis text color (ship scene) 
svn-id: r31517
 2008-04-16 19:43:56 +00:00
Torbjörn Andersson
7f9ac5e0b8 Fixed warning. 
svn-id: r31507
 2008-04-14 21:09:42 +00:00
Johannes Schickel
10fe009db3 Fixed music fade out. 
svn-id: r31506
 2008-04-14 20:57:24 +00:00
Johannes Schickel
91dafda250 Cleanup. 
svn-id: r31505
 2008-04-14 20:42:09 +00:00
Johannes Schickel
853b6e28e9 Implemented some kyra3 code. 
svn-id: r31503
 2008-04-14 20:20:51 +00:00
Torbjörn Andersson
618757a8c0 Fixed warning. 
svn-id: r31497
 2008-04-13 07:38:33 +00:00
Johannes Schickel
cb3ef94e34 Fixed palette after watching Kyra3 intro. 
svn-id: r31496
 2008-04-13 00:02:11 +00:00
Johannes Schickel
991a977990 Cleanup. 
svn-id: r31495
 2008-04-12 23:59:11 +00:00
Florian Kagerer
7d86690b29 fix crash and graphic glitch in non-playable HOF demo 
svn-id: r31494
 2008-04-12 23:55:26 +00:00
Johannes Schickel
bebb4cefd1 Initialize all screen buffers properly. 
svn-id: r31492
 2008-04-12 23:40:14 +00:00
Johannes Schickel
d718f5bffe Hopefully fix messed up gfx in first screen of Kyra 1 demo. 
svn-id: r31491
 2008-04-12 23:35:59 +00:00
Johannes Schickel
c533bfbfd2 Fixed graphics glitch in Kyra3 menu. 
svn-id: r31490
 2008-04-12 23:29:12 +00:00
Johannes Schickel
d54eaa39a1 Added fade out time parameter for digital sounds. 
svn-id: r31489
 2008-04-12 23:26:13 +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
Kari Salminen
d0f46196c2 Silence MSVC8+ warning C4800 about forcing an int value to bool that got turned into error C2220 (Warning treated as error). 
svn-id: r31484
 2008-04-11 11:05:04 +00:00
Florian Kagerer
829823c9a2 towns music file name fix 
svn-id: r31481
 2008-04-10 23:31:21 +00:00
Johannes Schickel
a81e9e456d Load all needed package files for kyra3 on startup. 
svn-id: r31480
 2008-04-10 22:25:38 +00:00
Johannes Schickel
6830ff3449 Small bug fix. 
svn-id: r31479
 2008-04-10 22:22:35 +00:00
Johannes Schickel
6711a494a2 Improved searchpath support. (Should again detect everything Common::File is able to load). 
svn-id: r31478
 2008-04-10 22:18:47 +00:00
Johannes Schickel
baf3d98513 - Reverted r31454 changes to detection.cpp 
- Added ADGF_CD to all CD versions
- Added ADGF_DROPLANGUAGE to Kyra2/3 CD version
- Changed Kyrandia engine to use agumented target ids

svn-id: r31476
 2008-04-10 21:50:41 +00:00
Johannes Schickel
9f16b3f5f5 Fixed regression in Kyra1. 
svn-id: r31474
 2008-04-10 20:42:56 +00:00
Johannes Schickel
5f3bfc702c - fixed valgrind warning 
- reduced midi volume fadeout from 2s to 1s like HoF is doing (Kyra1 should use the same value)

svn-id: r31473
 2008-04-10 19:33:06 +00:00
Johannes Schickel
924912b7fb Fixed track unloading for MIDI. 
svn-id: r31472
 2008-04-10 19:15:14 +00:00
Johannes Schickel
1bdc515880 Lock mutex in playSoundEffect, should help threading safeness of the code. 
svn-id: r31469
 2008-04-10 19:05:05 +00:00
Johannes Schickel
c13f2a73a3 Small fix related to all notes off event. 
svn-id: r31468
 2008-04-10 19:02:17 +00:00
Johannes Schickel
d91bc92189 Made KyraEngine::startup just loading soundfile instead of also playing track 0. 
svn-id: r31465
 2008-04-10 16:18:29 +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
aac2b7019a - Fixed missing static data for kyra1 demo 
- Fixed some warnings in create_kyradat
- Updated kyra.dat for new data for kyra1 demo

svn-id: r31463
 2008-04-10 15:05:59 +00:00
Florian Kagerer
3d407b81f8 fix drawShape glitch (Brandon's feet got mutilated and one vertical line was not drawn when leaving the screen to the left or to the right ) 
svn-id: r31461
 2008-04-09 23:38:11 +00:00
Johannes Schickel
7bd2ae65dd Oops removed leftover. 
svn-id: r31455
 2008-04-08 18:53:22 +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
9377fc7dc8 Some MIDI related cleanup. 
svn-id: r31443
 2008-04-07 17:56:04 +00:00
Florian Kagerer
831ab12268 implement missing Screen::drawShapePlotType11_15() 
svn-id: r31441
 2008-04-06 22:17:02 +00:00
Florian Kagerer
1fc3df7905 fix label for first save slot (towns/floppy) 
svn-id: r31440
 2008-04-06 19:48:47 +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
16066fa3e7 Fixed memory leaks. 
svn-id: r31437
 2008-04-06 15:35:30 +00:00
Johannes Schickel
6552193ceb Fixed mouse input handling when entering savefile description. 
svn-id: r31436
 2008-04-06 15:31:57 +00:00
Johannes Schickel
abf7914b81 Fixed walkspeed on save loading. 
svn-id: r31435
 2008-04-06 15:29:09 +00:00
Filippos Karapetis
9c59043664 Silenced MSVC warning 
svn-id: r31434
 2008-04-06 15:23:18 +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
Johannes Schickel
a05b085a21 Fixed potentional crash. 
svn-id: r31432
 2008-04-06 14:58:02 +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
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
a2e355d671 Implemented fadeout waiting in KyraEngine_v2::enterNewScene for AdLib. 
svn-id: r31424
 2008-04-06 13:57:28 +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
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
Max Horn
29f1e6de38 Advanced detector: replaced kADFlagAugmentPreferredTarget by its inverse, kADFlagDontAugmentPreferredTarget (since all AdvDetector engines except Kyra used kADFlagAugmentPreferredTarget, it seems reasonable to assume that as default) 
svn-id: r31413
 2008-04-05 22:29:08 +00:00
Johannes Schickel
bfdca912bc Fixed regression causing a crash when the user had less than 5 savefiles. 
svn-id: r31412
 2008-04-05 17:33:54 +00:00
Johannes Schickel
c676cf560f Fixed crash when supplying illegal savefile names. 
svn-id: r31402
 2008-04-05 05:23:46 +00:00
Johannes Schickel
c826716a91 Don't rename quicksave filenames when deleting files. 
svn-id: r31401
 2008-04-05 03:13:26 +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
066a55ef33 Small fix in processButtonList. 
svn-id: r31399
 2008-04-05 02:50:38 +00:00
Johannes Schickel
dd8676877e - cleanup 
- sort savefiles in kyra from newest -> oldest

svn-id: r31397
 2008-04-05 02:40:28 +00:00