5082 Commits

Author SHA1 Message Date
Gregory Montoir
0867e09a81 - added CTMF music support
- fixed dialogue in PART12

svn-id: r29552
2007-11-18 06:25:23 +00:00
Paul Gilbert
7b458c96b0 Bugfix to only delay showing a new talk dialog if there isn't one active in the current room
svn-id: r29550
2007-11-18 06:16:58 +00:00
Paul Gilbert
3364e03517 Reordered savegame content to fix bug where restoring a savegame from after a fight caused the opponent to briefly appear alive again
svn-id: r29549
2007-11-18 06:14:53 +00:00
Paul Gilbert
eadb5b7292 Added sounds to endgame animation sequence
svn-id: r29548
2007-11-18 05:11:38 +00:00
Paul Gilbert
4d21471155 Cleaned up animation player and added support for a set of sounds to be played during an animation
svn-id: r29547
2007-11-18 05:10:56 +00:00
Travis Howell
2670862c33 Update comment for workaround for bug #1745996.
svn-id: r29545
2007-11-18 04:42:40 +00:00
Travis Howell
4ce9b7fa15 Switch invalid items back to error message, since restart state issues are fixed now..
svn-id: r29544
2007-11-18 04:34:08 +00:00
Travis Howell
70c4f25aef Fix loading restart state file in Amiga version of Waxworks.
svn-id: r29543
2007-11-18 04:02:11 +00:00
Travis Howell
7bc422a8e9 Use unique save game naming for PC versions of Elvira 2 and Waxworks, due to the save game format differences.
svn-id: r29539
2007-11-17 12:48:28 +00:00
Paul Gilbert
9a07589de8 Bugfix to properly clear previous room layers and fade in the screen when restoring a game
svn-id: r29537
2007-11-17 11:03:18 +00:00
Paul Gilbert
813ca5cf39 Added missing code to deactivate animations that have finished
svn-id: r29536
2007-11-17 10:49:14 +00:00
Torbjörn Andersson
14ac86abe0 Fixed sluggish mouse cursor during palette fade ins/outs.
svn-id: r29535
2007-11-17 10:47:37 +00:00
Travis Howell
f10f40aff0 Fix bug #1759850 - ELVIRA2: Restart state file causes crash. The itemStore data needed to be adjusting, when loading or saving in the AtariST and Amiga versions.
svn-id: r29534
2007-11-17 10:27:31 +00:00
Paul Gilbert
2e3866b6f4 Identified some more Endian issues (thanks to Max)
svn-id: r29533
2007-11-17 10:21:27 +00:00
Nicola Mettifogo
a3abaaa709 Refactored main input code.
svn-id: r29532
2007-11-17 09:39:20 +00:00
Paul Gilbert
eaee457431 Added missing destructor and sounds to barrel animation sequence
svn-id: r29531
2007-11-17 08:58:31 +00:00
Paul Gilbert
75382bdadc Added saving of the current hotspot animation record to savegames
svn-id: r29528
2007-11-17 08:44:38 +00:00
Paul Gilbert
4987cde3a1 Changed default value of _walkFlag in Hotspot constructor
svn-id: r29527
2007-11-17 08:42:23 +00:00
Paul Gilbert
ca10a4db08 Bugfixes to the fighting animations and proper reset of fight data between save sessions
svn-id: r29526
2007-11-17 06:53:13 +00:00
Paul Gilbert
1002a58f01 Cleaned up the logic of the activateHotspot method
svn-id: r29525
2007-11-17 06:52:35 +00:00
Paul Gilbert
d5dc2e075a Bugfixes to restoring or restarting a game from the Restore/Restart dialog
svn-id: r29524
2007-11-17 00:19:45 +00:00
Johannes Schickel
7b43ba576c Added const to static data.
svn-id: r29520
2007-11-16 23:08:17 +00:00
Paul Gilbert
85be70f65b Fixed a direct access causing endian problems
svn-id: r29519
2007-11-16 22:59:40 +00:00
Nicola Mettifogo
058009a113 Refactored language selection code.
svn-id: r29518
2007-11-16 22:03:39 +00:00
Max Horn
c8ce5b1865 Changed Audio::makeADPCMStream so that the stream passed to it can automatically be disposed
svn-id: r29517
2007-11-16 10:05:18 +00:00
Paul Gilbert
ca2641b70f Changed conversation guards so that the player talking will only be paused if there's another active conversation that's in the same room
svn-id: r29516
2007-11-16 08:59:18 +00:00
Paul Gilbert
fe690d5688 Bugfix for talk dialog not closing if the same character talks twice in immediate succession
svn-id: r29515
2007-11-16 08:54:38 +00:00
Paul Gilbert
6f23a38c12 Added guard to prevent a character being reset to a default direction frame after a call to SetDirection if they're already facing in that direction - fixes some characters alternating frames
svn-id: r29514
2007-11-16 07:47:43 +00:00
Paul Gilbert
4bfa437887 Bugfix to make player walk over to Goewin when talking to her
svn-id: r29513
2007-11-16 07:32:03 +00:00
Paul Gilbert
ced8d602a7 Bugfix to have NPC stand still during showMessage talk actions
svn-id: r29512
2007-11-16 06:53:18 +00:00
Gregory Montoir
de750efced added support for Adlib tracks
svn-id: r29509
2007-11-15 20:21:33 +00:00
Paul Gilbert
b95a102011 Fixes to parameters of script methods
svn-id: r29508
2007-11-15 11:33:16 +00:00
Paul Gilbert
61e8ad7a32 Bugfix to prevent characters occasionally facing one way whilst walking in another direction
svn-id: r29507
2007-11-15 10:07:46 +00:00
Nicola Mettifogo
0dc9a12db9 Removed an unclear (paranoid?) continue statement from the original engine. We are just doing a screen update more than the original this way. If this is bad, then we can go back, but for now, let the execution flow.
svn-id: r29505
2007-11-14 22:31:53 +00:00
Nicola Mettifogo
10caba3562 * centralized kEngineChangeLocation flag handling
* simplified runGame, moving flags testing into called routines

svn-id: r29504
2007-11-14 22:24:26 +00:00
Max Horn
193e59151c Improved the game desc naming in the drascula detection code
svn-id: r29503
2007-11-14 19:27:08 +00:00
Paul Gilbert
2a24ecaf9b Fixed clipping issues that were still occurring in some rooms
svn-id: r29500
2007-11-14 11:46:55 +00:00
Kostas Nakos
323cb4827f Moving the vitual keyboard show/hide hints during the copy protection screens to the scumm engine.
As the original code is slightly cryptic, there may be something wrong with MI1 (as commented)

svn-id: r29495
2007-11-13 19:41:35 +00:00
Johannes Schickel
be01daccdb - implemented opcodes:
-> o2_setHiddenItemsEntry 147
  -> o2_getHiddenItemsEntry 148
  -> o2t_fadeScenePal 3
- added o2t_playSoundEffect to the temporary opcode list

svn-id: r29494
2007-11-13 15:49:21 +00:00
Paul Gilbert
149e87ecfb Added guard to prevent one character's talk dialog interrupting another one that's already in-progress
svn-id: r29492
2007-11-13 09:49:43 +00:00
Paul Gilbert
3d796f4b53 Tweak to object walk to position calculations - NPCs will no longer get stuck in doors they close
svn-id: r29489
2007-11-13 08:47:25 +00:00
Johannes Schickel
c908a8a73f Implemented all timer handlers. (Cauldron animations work now)
svn-id: r29487
2007-11-12 20:04:44 +00:00
Filippos Karapetis
71d54d1d36 Added a workaround for a problematic object in Gorrister's chapter (Edna's key)
svn-id: r29486
2007-11-12 19:49:42 +00:00
Johannes Schickel
2e46b741a3 - Implemented opcodes:
-> o2_removeHandItem 43
  -> o2_makeBookOrCauldronAppear 42
- Implemented inventory WSA functionality

svn-id: r29485
2007-11-12 17:56:49 +00:00
Johannes Schickel
65c57841bd Fixes regression introduced with r29218.
svn-id: r29484
2007-11-12 16:35:46 +00:00
Paul Gilbert
16a4708adc Set Catriona to her correct rocking speed
svn-id: r29483
2007-11-12 10:30:23 +00:00
Paul Gilbert
7bf1b77f3c removeSounds was being called too early - it was setting the current area to that of the room being left, rather than the one being entered
svn-id: r29482
2007-11-12 10:09:33 +00:00
Paul Gilbert
705cf3cc87 Adjustments to the talk state machine so information dialogs (if any) correctly occur at the end of a conversation (such as giving the bar to Ewan)
svn-id: r29481
2007-11-12 09:53:10 +00:00
Paul Gilbert
6ccbfcf611 Correction to delay when two NPCs are talking together
svn-id: r29480
2007-11-12 09:16:00 +00:00
Max Horn
d2ee52abba Silencing some warnings
svn-id: r29479
2007-11-11 20:17:13 +00:00