Commit Graph

666 Commits

Author SHA1 Message Date
Jordi Vilalta Prat
d6c34bdc4b Fixed the spaces before tabs.
svn-id: r30667
2008-01-28 00:14:17 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Paul Gilbert
2195528ca0 Got rid of the experimental NPC Schedule store in favour of moving the NPC schedules from the active hotspot class back into the hotspot data class, similiar to how the original game implements them
svn-id: r30629
2008-01-24 08:14:48 +00:00
Paul Gilbert
00796bb598 Bugfix for transformation sparkle to finish if the player changes room partway through animation
svn-id: r30609
2008-01-22 09:46:11 +00:00
Paul Gilbert
c9b6822438 Fixed shadowing warning that I missed
svn-id: r30584
2008-01-20 03:42:42 +00:00
Paul Gilbert
99e2c7c1d6 Fixed bug with saving of cached actor schedules and added saving of talk data flags
svn-id: r30582
2008-01-20 03:38:16 +00:00
Paweł Kołodziejski
b74d38586d fixed potential unitialized variable
svn-id: r30574
2008-01-19 20:53:28 +00:00
Paul Gilbert
e6c20003c0 Enhanced Surface::writeSubstring to crop any string that exceeds the width of the surface - this fixes a visual glitch in the German version where some lines were so long they were exceeding the size of the screen
svn-id: r30547
2008-01-18 10:49:48 +00:00
Paul Gilbert
586ef72e96 Increase talk dialog size by 2 pixels to accommodate a very long word in the German version
svn-id: r30545
2008-01-18 10:43:51 +00:00
Paul Gilbert
4511ba81a4 Bugfix for logging the description of actions being done
svn-id: r30532
2008-01-17 11:18:30 +00:00
Paul Gilbert
3a0f7b4ea8 Updated required lure.dat version number
svn-id: r30526
2008-01-17 09:50:42 +00:00
Paul Gilbert
00ecb126e3 Bugfix for the position and size of the copy protection dialog instructions in the German version
svn-id: r30524
2008-01-17 09:05:56 +00:00
Paul Gilbert
019624e3c1 Added code fragment to correctly set the walk to position for Goewin (for interacting with her) both when she's in the Apothecary and when she's out walking
svn-id: r30515
2008-01-16 10:06:19 +00:00
Paul Gilbert
a5a4a6fde5 Bugfix for actors getting stuck (losing their schedule)
svn-id: r30435
2008-01-12 06:34:11 +00:00
Paul Gilbert
dde154c3ed Removed old copyright 2005-2006 line from several files so that their headers are consistant with the other files
svn-id: r30433
2008-01-12 01:30:11 +00:00
Paul Gilbert
b14da0b02c Fix for debug logging of the current action name
svn-id: r30386
2008-01-10 21:32:49 +00:00
Torbjörn Andersson
89f15fe482 Fixed warnings.
svn-id: r30379
2008-01-10 19:06:38 +00:00
Paul Gilbert
d804bad551 Replaced the Blacksmith hack with an NPC Schedules list that stores the active schedule of an NPC when it's deactivated in case it's later reactivated again.
svn-id: r30378
2008-01-10 13:37:34 +00:00
Paul Gilbert
8b9c7b2137 Corrected the name of script method #39 which closes the town hall door
svn-id: r30371
2008-01-10 10:48:04 +00:00
Paul Gilbert
1d4efdcaa1 Added proper reset of barmen data when game is restarted, and added missing barman data to savegames
svn-id: r30367
2008-01-10 09:42:51 +00:00
Paul Gilbert
fee6362147 Bugfix for incorrect data being saved for the current NPC the barmen are serving
svn-id: r30365
2008-01-10 09:22:46 +00:00
Paul Gilbert
6d4d02a27f Bugfix for #1866784 - Castle Skorl can be activated multiple times
svn-id: r30354
2008-01-09 12:36:58 +00:00
Paul Gilbert
af443ba924 Bugfix for #1866782 - fixes the issue with the Blacksmith being reactivated after earlier being deactivated in the middle of hammering the anvil
svn-id: r30353
2008-01-09 11:14:15 +00:00
Paul Gilbert
34c3c89267 Fix for #1866777 - adds saving of hotspot layer to savegames
svn-id: r30347
2008-01-09 09:13:39 +00:00
Paul Gilbert
241c337dc3 Fixed popup menu height so bottom action doesn't partially overlap the bottom border
svn-id: r30346
2008-01-09 02:32:18 +00:00
Paul Gilbert
cd23db6ce8 Changed method parameter name to prevent shadowing warning
svn-id: r30340
2008-01-08 06:18:33 +00:00
Paul Gilbert
965eddf0dc Enhanced NPC walk-to logic to handle separately several special Ids that were previously handled identically
svn-id: r30339
2008-01-08 06:13:55 +00:00
Paul Gilbert
660d9a89d7 Bugfix for #1865552 - crash when waiting for patrol. Incorrect value was being passed to retrieve a hotspot pointer
svn-id: r30336
2008-01-08 03:09:00 +00:00
Paul Gilbert
a137ff2cf1 Changed debug keys enablement to be on by default if a Debug Level is specified
svn-id: r30322
2008-01-07 10:32:54 +00:00
Paul Gilbert
841cc77e5c Made debugging keys disabled by default, with a debugger command to allow them to be turned on
svn-id: r30317
2008-01-07 03:53:30 +00:00
Paul Gilbert
c43a851e13 Changed the frame delay for part of the introduction sequence to match the original game and prevent the music from running out before the next animation begins
svn-id: r30287
2008-01-06 02:59:41 +00:00
Paul Gilbert
b535b070f3 Fix to show talk dialogs in EGA mode using the EGA palette
svn-id: r30286
2008-01-06 02:09:18 +00:00
Paul Gilbert
6eb64102a4 Fix to remove a tab character from the GPL header
svn-id: r30238
2008-01-05 12:45:14 +00:00
Paul Gilbert
62fdf1afa0 Changed room change code for an immediate transition when in EGA mode (which can't do fades)
svn-id: r30236
2008-01-05 12:09:24 +00:00
Paul Gilbert
705bd9236c Fix for popup menus to work in EGA mode
svn-id: r30234
2008-01-05 11:25:30 +00:00
Paul Gilbert
9e02b32220 Made standard EGA background colour a constant
svn-id: r30233
2008-01-05 11:24:37 +00:00
Paul Gilbert
735ea1eaaa Fix to show credits screen correctly in EGA mode
svn-id: r30232
2008-01-05 10:53:27 +00:00
Paul Gilbert
140d914c18 Brought waitForPress into line with other similar methods to not register control characters
svn-id: r30231
2008-01-05 10:38:50 +00:00
Paul Gilbert
13cb1e710f Fix to use correct EGA/VGA colour when displaying talk conversation options
svn-id: r30230
2008-01-05 10:37:36 +00:00
Paul Gilbert
2c86089264 Fix for showing the correct colour in the status line in EGA mode
svn-id: r30229
2008-01-05 10:36:36 +00:00
Paul Gilbert
65399321eb Added support for the EGA style menu
svn-id: r30228
2008-01-05 10:35:47 +00:00
Paul Gilbert
f5577f8470 Removed redundant parameters and clarified EGA and VGA specific definitions
svn-id: r30227
2008-01-05 10:35:22 +00:00
Paul Gilbert
10719d5a12 Added extra handling for EGA dialogs, and added formalised parameters/methods for text positioning
svn-id: r30226
2008-01-05 10:34:34 +00:00
Paul Gilbert
610880dc67 Corrected the RGB values generated for a given EGA palette index
svn-id: r30224
2008-01-05 07:20:26 +00:00
Paul Gilbert
9efa3a5ec3 Added MD5 for English EGA version
svn-id: r30175
2008-01-03 00:34:52 +00:00
Paul Gilbert
b6f39fb8fb Adjusted the colour of the EGA cursors to match the original game
svn-id: r30146
2008-01-02 11:45:59 +00:00
Paul Gilbert
977c9fb5f3 Enhanced cursor code to handle cursors in EGA mode
svn-id: r30143
2008-01-02 11:15:36 +00:00
Paul Gilbert
eff113c486 Fixed Palette constructor parameter to be uint16 rather than uint8
svn-id: r30142
2008-01-02 11:14:42 +00:00
Paul Gilbert
3b658492f5 Fix to make EGA sprites appear correctly
svn-id: r30140
2008-01-02 07:14:02 +00:00
Paul Gilbert
b2d2bd6f2d Room backgrounds now display in EGA mode
svn-id: r30138
2008-01-02 03:36:19 +00:00
Paul Gilbert
86aeae4a74 Bugfix to show the final text screen correctly in EGA mode
svn-id: r30131
2008-01-01 22:55:54 +00:00
Paul Gilbert
79a9074548 Added support for the EGA introduction sequence
svn-id: r30116
2008-01-01 13:00:47 +00:00
Paul Gilbert
4308e6ab10 Added EGA related constants
svn-id: r30115
2008-01-01 12:59:40 +00:00
Paul Gilbert
e3c60fea4e Extended PaletteCollection class to handle EGA palettes
svn-id: r30114
2008-01-01 12:58:50 +00:00
Paul Gilbert
87ed2bf0cb Extended animation class to handle EGA animations
svn-id: r30113
2008-01-01 12:58:04 +00:00
Eugene Sandulenko
b87b0f21f0 Used new AdvancedDetector flag to distinguish between EGA and VGA versions
of italian Lure when their datafiles sit in same directory.

svn-id: r30106
2007-12-31 14:46:37 +00:00
Paul Gilbert
10686b04ab Bugfix to data position start in vga decoder, and made ega/vga decoder methods public visibility
svn-id: r30104
2007-12-31 13:37:14 +00:00
Paul Gilbert
1804ae6639 Added code to handle EGA title screens being immediately shown rather than faded in
svn-id: r30098
2007-12-31 05:59:58 +00:00
Paul Gilbert
1dd2e32fc0 Added extra palette handling for EGA palettes
svn-id: r30097
2007-12-31 05:58:22 +00:00
Paul Gilbert
ccc822fd1c Added support for decoding EGA screens
svn-id: r30096
2007-12-31 05:57:11 +00:00
Paul Gilbert
abd3f45359 Added code to support reading .ega files
svn-id: r30095
2007-12-31 05:56:22 +00:00
Paul Gilbert
d45fe1e37e Added detection for Italian EGA version
svn-id: r30094
2007-12-31 05:55:20 +00:00
Paul Gilbert
2c5ae92b4c Added ability for both middle and right mouse buttons to abort a conversation when waiting for user to select a conversation option from a list of topics
svn-id: r30071
2007-12-29 10:38:30 +00:00
Paul Gilbert
99dfb8bcbc Added support for using scroll wheel for making selections in the Save/Restore dialog and action lists
svn-id: r30070
2007-12-29 09:51:25 +00:00
Paul Gilbert
59b5655266 Added access property for middle mouse button
svn-id: r30069
2007-12-29 09:50:20 +00:00
Paul Gilbert
a54f9c311a Fix to ensure any active conversation data or selected hotspot is cleared when restoring or restarting a game
svn-id: r30066
2007-12-29 04:25:26 +00:00
Paul Gilbert
52dc147f8c Added mouse scrolling support to action menus and the save/restore dialog
svn-id: r30065
2007-12-29 00:31:15 +00:00
Paul Gilbert
16b610068d Fix for correct dialog sequence when giving an object to an arbitrary NPC
svn-id: r30063
2007-12-28 22:56:22 +00:00
Paul Gilbert
4d7e49ddb8 Fix to prevent the F5 key allowing the game to be saved during player conversations or viewing a remote room
svn-id: r30048
2007-12-28 11:07:35 +00:00
Paul Gilbert
ae06d5337e Bugfix to correctly display a message when a used item is no longer in the room
svn-id: r30037
2007-12-28 07:46:21 +00:00
Paul Gilbert
67a49e712a Bugfix for string decoding to use the article of the destination character rather than the talking character
svn-id: r30036
2007-12-28 07:45:22 +00:00
Paul Gilbert
ada25791c6 Bugfix for action perform timeout to correctly show an question mark bubble. Also changed a writeSint16LE call to be more correctly writeUint16LE
svn-id: r30026
2007-12-28 04:00:15 +00:00
Paul Gilbert
d6788c3291 Workaround for unterminated look description in Italian version
svn-id: r29960
2007-12-23 12:27:43 +00:00
Paul Gilbert
33545452f0 Fix for problem that the player could stop themselves changing back from Selena if they left the current room too quickly after the change back had been scheduled
svn-id: r29958
2007-12-23 11:34:22 +00:00
Paul Gilbert
5e29703ea8 Bugfix for Town Hall room: Captive Goewin's bounds were frequently and incorrectly preventing the player from talking to the Skorl
svn-id: r29957
2007-12-23 10:52:18 +00:00
Paul Gilbert
337db5d4c7 Bugfix to not allow animation fast forward when restoring a game - it was causing occasional crashes due to tick handlers referencing animations not yet loaded (it's only meant to be done during room changes)
svn-id: r29950
2007-12-22 11:34:10 +00:00
Paul Gilbert
9dc39c302a Tweaked the calculation for player position in new rooms to use the original game's rounding - the current code was causing the player to be placed inside the exit area when entering room 6 from room 5.
svn-id: r29949
2007-12-22 11:24:29 +00:00
Paul Gilbert
c0bc7bb7d6 Incremented required lure.dat version number, and adjusted animation indexes to account for added fight animation entry
svn-id: r29948
2007-12-22 11:16:57 +00:00
Paul Gilbert
dca07a9d14 Bugfix to prevent axe animation appearing in room 6 when returning there after the fight
svn-id: r29937
2007-12-21 09:10:31 +00:00
Paul Gilbert
b4043cb403 Bugfix for correctly handling \n characters in WordWrap method
svn-id: r29903
2007-12-19 01:47:45 +00:00
Paul Gilbert
550aea90ff Bugfix for font sizes indexing - dereferencing a character > 128 was giving a negative index
svn-id: r29900
2007-12-18 08:05:19 +00:00
Paul Gilbert
e2e846a4b2 Added extra debug statements to the talk dialog display process
svn-id: r29894
2007-12-17 11:23:19 +00:00
Paul Gilbert
20db7b7d28 Added some casting of fields in debug statements
svn-id: r29893
2007-12-17 11:21:26 +00:00
Paul Gilbert
fb222b0afa Changed Credits display to avoid the brief flash as the palette changed
svn-id: r29892
2007-12-17 03:29:02 +00:00
Paul Gilbert
08f1f2c3d3 Bugfix for Use actions to work correctly
svn-id: r29891
2007-12-16 22:41:51 +00:00
Torbjörn Andersson
25103d11e2 Removed unused variable.
svn-id: r29885
2007-12-16 20:20:09 +00:00
Kostas Nakos
b5ab73075c adding clickable menu functionality, which is very good to have on devices with fixed/cumbersome/synthesized left and right click events (wince, palmos, ...)
svn-id: r29883
2007-12-16 20:07:01 +00:00
Kostas Nakos
e861cf567d use the virtual keyboard facilities if available, when needed
svn-id: r29882
2007-12-16 20:01:41 +00:00
Torbjörn Andersson
943ab421a4 The _nativeMT32 in MidiMusic was never initialised. Rather than storing it in
two different classes, use the value in SoundManager instead. As a consequence
the engine now remaps the instruments from MT-32 to General MIDI for me, since
isRoland() is true and hasNativeMT32() is false. Earlier, it didn't since the
uninitialised _nativeMT32 happened to be true for me.

svn-id: r29878
2007-12-16 14:46:48 +00:00
Torbjörn Andersson
0b74448ded An element was missing in the initialisation of sounds during the endgame
sequence. It seems to correspond to the original's end_seq_data, so this should
be the correct value. I hope.

svn-id: r29877
2007-12-16 13:28:00 +00:00
Paul Gilbert
aa96ec9940 Bugfix for walking to hotspots - if the mouse was already highlighting the hotspot when a room was entered, clicking on it would cause the player to walk to an arbitrary exit
svn-id: r29875
2007-12-16 09:36:07 +00:00
Paul Gilbert
11cebee5e3 Tweaked the delay for several of the introduction message screens
svn-id: r29874
2007-12-16 08:20:35 +00:00
Paul Gilbert
706e779236 Hooked up the sound code to use the configuration for sfx and music, and added code from the original game that used the high bit of sounds to distinguish between the two
svn-id: r29873
2007-12-16 08:19:56 +00:00
Paul Gilbert
02beb045c5 Added a debugger method to show a specified entry in the string table
svn-id: r29872
2007-12-16 08:14:14 +00:00
Paul Gilbert
258bd20a83 Changed interruptableDelay method to not break when a modifier key is pressed
svn-id: r29871
2007-12-16 08:11:52 +00:00
Paul Gilbert
2a8166dde5 Changed delay method to not break when a modifier key is pressed
svn-id: r29870
2007-12-16 08:10:47 +00:00
Paul Gilbert
a9ced688bc Bugfix for followers doing an Ask action in another room
svn-id: r29869
2007-12-16 03:47:24 +00:00
Paul Gilbert
69b1c7b4dd Dynamic fix for several incorrect accented characters in the Italian version
svn-id: r29836
2007-12-12 09:45:51 +00:00
Paul Gilbert
c6871d145e Bugfix to return correct article indexes
svn-id: r29835
2007-12-12 08:56:34 +00:00
Paul Gilbert
a5f429c351 Incremented the required version of lure.dat because string resource has changed
svn-id: r29834
2007-12-12 08:49:41 +00:00
Paul Gilbert
2b9859f2ff Redeveloped the processing of language item article prefixes to match how the original handles the various languages
svn-id: r29833
2007-12-12 08:49:09 +00:00
Paul Gilbert
f826e62771 Bugfix for the display of ASK, GIVE, and TELL actions in the status line
svn-id: r29825
2007-12-11 10:12:12 +00:00
Paul Gilbert
4a8cca094c Bugfix to make the Use action work correctly
svn-id: r29824
2007-12-11 09:20:24 +00:00
Paul Gilbert
1af72d0971 Changed over warning messages for save/load errors from the debug console to their own dialog
svn-id: r29814
2007-12-10 09:40:49 +00:00
Chris Apers
1cfadf725c Hack to workaround struct padding added by some compilers (mainly on PalmOS)
svn-id: r29777
2007-12-09 10:39:57 +00:00
Paul Gilbert
04bfc7158a Bugfix to correctly display a hotspot name in message dialogs that include it
svn-id: r29776
2007-12-09 10:39:50 +00:00
Paul Gilbert
f89dbfe91c Added code to set ACTIVE_HOTSPOT_ID and USE_HOTSPOT_ID fields correctly when an action is performed
svn-id: r29775
2007-12-09 10:08:41 +00:00
Paul Gilbert
770d0b88d6 Added extra debug statements
svn-id: r29774
2007-12-09 06:06:22 +00:00
Paul Gilbert
41f8a2ff6a Added extra debug statements
svn-id: r29773
2007-12-09 05:59:01 +00:00
Paul Gilbert
a39ddab09a Added new debug category for string handling
svn-id: r29772
2007-12-09 05:57:08 +00:00
Paul Gilbert
e204af821f Added some missing deletes of temporary objects
svn-id: r29762
2007-12-08 10:30:43 +00:00
Paul Gilbert
870edd1b58 Bugfix so player will move out of the way if he's blocking an entrance a character is entering by
svn-id: r29746
2007-12-07 12:01:44 +00:00
Paul Gilbert
ec54c02ff8 Changed startup error messages to use a modal GUI dialog
svn-id: r29745
2007-12-07 10:17:58 +00:00
Paul Gilbert
f313c83ccd Fix for bug 1843961: Assertion on talking to a NPC - initial 'hey wait' dialog was resetting the destination character just before the conversation started
svn-id: r29743
2007-12-07 08:16:52 +00:00
Eugene Sandulenko
218dcf2c18 Switch Lure engine to AdvancedDetector
svn-id: r29734
2007-12-06 12:10:41 +00:00
Paul Gilbert
8713d1f7db Reworked the fight loop and event handling so fights run at the same speed as in the original game
svn-id: r29709
2007-12-03 12:26:45 +00:00
Paul Gilbert
692d64f934 Added some more code to the savegame load process to correctly handle previously saved savegames (from version 25)
svn-id: r29693
2007-12-02 08:32:21 +00:00
Paul Gilbert
bc58491c75 Modified the loadScreen method to accommodate some screens decoding to a single byte more than the actual screen size
svn-id: r29691
2007-12-02 07:24:41 +00:00
Paul Gilbert
11e29ca4d4 Bugfix to make any animation the player is doing uninterruptable
svn-id: r29690
2007-12-02 04:52:01 +00:00
Paul Gilbert
804c821ab1 Enhanced savegames to store any active dialog when the game was saved
svn-id: r29689
2007-12-02 04:49:33 +00:00
Paul Gilbert
4031b98349 Reworked the RoomResource structure to make the game easier to compile on PalmOS
svn-id: r29687
2007-12-02 01:17:51 +00:00
Paul Gilbert
7bc6a3a47a Changed assert for missing animation to explicitly give the animation Id
svn-id: r29684
2007-12-01 23:57:22 +00:00
Torbjörn Andersson
a77f6157dc Fixed Valgrind warning by freeing _lines with Memory::dealloc() insead of
delete.

svn-id: r29680
2007-12-01 15:37:48 +00:00
Paul Gilbert
91c73e6c76 Fix for give method - one object range was incorrectly being reported as not being valid objects
svn-id: r29679
2007-12-01 10:35:24 +00:00
Paul Gilbert
30af5576d7 Fix for Valgrind warning - at least one animation read a single byte beyond the end of the source data just prior to finishing decompression
svn-id: r29678
2007-12-01 10:34:22 +00:00
Paul Gilbert
5cf2a45b77 Fixed endian bug in the decoding of strings
svn-id: r29674
2007-11-30 23:58:29 +00:00
Travis Howell
50c6920d6f Add additional German version of Lure of the Temptress.
svn-id: r29661
2007-11-30 10:47:33 +00:00
Paul Gilbert
4e3090377f Added detection of Spanish version
svn-id: r29654
2007-11-28 10:37:40 +00:00
Paul Gilbert
cdd9fa3556 - Changed sound creation to automatically reset volume so that introduction sound sequences play correctly
- Cleaned up my channel sharing code to allow for either cropping the number of channels used or use the same channel multiple times. Ideally, though, I need to find out if the MidiParser can be set to use less than 8 channels

svn-id: r29648
2007-11-27 10:09:42 +00:00
Paul Gilbert
664ab3ea7e Removed old commented out debug code
svn-id: r29647
2007-11-27 10:02:53 +00:00
Paul Gilbert
a4bbdd2292 Fixed call to create puzzled/exclamation voice bubbles
svn-id: r29623
2007-11-24 09:47:19 +00:00
Paul Gilbert
c7b3130b66 Bugfix for the Escape key to close the Save/Restore dialog
svn-id: r29609
2007-11-22 11:21:04 +00:00
Paul Gilbert
40abab62af Removed deprecated language variable
svn-id: r29605
2007-11-22 10:13:43 +00:00
Paul Gilbert
78c1f8504a Talk data bugfix - create_lure was reading past the end of the talk data list
svn-id: r29604
2007-11-22 10:10:35 +00:00
Paul Gilbert
b6fbe6ec4e Changed animation constants to clarify standard indexes versus custom voice bubble Ids
svn-id: r29603
2007-11-22 10:09:26 +00:00
Paul Gilbert
a03f51893c Fixed menu data for German version
svn-id: r29602
2007-11-22 10:07:47 +00:00
Paul Gilbert
d9863ff237 Re-enabled detection of French and German versions
svn-id: r29601
2007-11-22 10:06:47 +00:00
Paul Gilbert
2393e87a7a Added a check to keep the cursor active when entering a savegame name on backends that provide a virtual keyboard
svn-id: r29578
2007-11-20 12:48:59 +00:00
Paul Gilbert
724d99b74f Changed the copy protection dialog event loop so the fourth digit pressed will be briefly displayed
svn-id: r29577
2007-11-20 12:39:24 +00:00
Paul Gilbert
5eb9b10bbd Changed calls to pollEvent to be in while loops to ensure all pending events get processed
svn-id: r29576
2007-11-20 12:26:06 +00:00
Torbjörn Andersson
ade0b5a212 Fixed sluggish mouse cursor on restart/restore screen.
svn-id: r29555
2007-11-18 10:08:43 +00:00
Paul Gilbert
9195905008 Further fixes to sound code (thanks to eriktorbjorn)
svn-id: r29554
2007-11-18 08:11:29 +00:00
Paul Gilbert
ab445635cb Added some extra mutex locks to the sound code to hopefully prevent randomo crashes
svn-id: r29553
2007-11-18 07:42:49 +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
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
Paul Gilbert
2e3866b6f4 Identified some more Endian issues (thanks to Max)
svn-id: r29533
2007-11-17 10:21:27 +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
Paul Gilbert
85be70f65b Fixed a direct access causing endian problems
svn-id: r29519
2007-11-16 22:59:40 +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
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
Paul Gilbert
2a24ecaf9b Fixed clipping issues that were still occurring in some rooms
svn-id: r29500
2007-11-14 11:46:55 +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
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
Paul Gilbert
24303fb953 Expanded talk routines so that characters now properly stand still only when they're meant to
svn-id: r29471
2007-11-10 22:47:11 +00:00
Paul Gilbert
5f6cb432fb Restoring a game now correctly fades out the current room like the original
svn-id: r29459
2007-11-09 08:22:09 +00:00
Paul Gilbert
25d22b2b42 Check to prevent Ratpouch saying 'Excuse me' redundantly
svn-id: r29458
2007-11-09 08:21:15 +00:00
Paul Gilbert
c2594cb3f2 Reordered construction of game instance so that the sounds played in the introduction can properly check the sound flag status
svn-id: r29452
2007-11-08 11:55:51 +00:00
Paul Gilbert
27a1f38862 Added sound to animation of falling down the chute
svn-id: r29451
2007-11-08 11:06:24 +00:00
Paul Gilbert
cafc46fc8f Bugfix for correct use of article prefixes on character names embedded in talk messages
svn-id: r29450
2007-11-08 10:51:47 +00:00
Paul Gilbert
ea19791de5 Bugfix for approaching Ratpouch, and have him properly stand still until he's received instructions
svn-id: r29449
2007-11-08 10:50:26 +00:00
Paul Gilbert
9fc974209b Bugfix for NPC conversations so they'll only stand still when they should, and pause correctly during scripted animations
svn-id: r29445
2007-11-07 09:39:48 +00:00
Paul Gilbert
1a82b2630d Removed reference to KyraEngine that shouldn't be there
svn-id: r29444
2007-11-07 09:36:49 +00:00
Paul Gilbert
e4125a0368 Current room is now correctly refreshed after showing credits
svn-id: r29278
2007-10-28 04:28:27 +00:00
Paul Gilbert
cb302b244b Room fades now correctly fade out any active talk dialog
svn-id: r29277
2007-10-28 04:27:18 +00:00
Paul Gilbert
641ff5e9b7 Sound is now paused when displaying menu dialogs
svn-id: r29272
2007-10-28 03:34:10 +00:00
Paul Gilbert
5f1ef91820 Added storing of playing sounds to savegame (note: only sounds flagged as restorable are restarted after loading a savegame)
svn-id: r29271
2007-10-28 03:32:13 +00:00
Paul Gilbert
a48d2d3ff3 Talk dialogs can now only be closed early if it's the player talking, or an NPC is talking directly to the player
svn-id: r29258
2007-10-25 10:40:26 +00:00
Paul Gilbert
864ed910fa Bugfix to make sound toggle work correctly, and added flag state to savegames
svn-id: r29257
2007-10-25 10:39:19 +00:00
Paul Gilbert
c0f285693c Added saving of NPC direction, and bugfix for closing talk dialogs
svn-id: r29256
2007-10-25 10:37:23 +00:00
Paul Gilbert
c9d06136bc Removed unused field
svn-id: r29255
2007-10-24 10:16:19 +00:00
Paul Gilbert
547716a0df Added a talkerId field to hotspots to better handle characters being talked to
svn-id: r29254
2007-10-24 10:09:06 +00:00
Paul Gilbert
a0fce0c5a1 Fixed MinGW compilation warning
svn-id: r29253
2007-10-24 10:07:38 +00:00
Paul Gilbert
9a1b13e965 Changed startSpeakingToNoone to pause the speaking character
svn-id: r29252
2007-10-24 10:04:24 +00:00
Paul Gilbert
5635256f30 Implemented gradual display of text in talk dialogs
svn-id: r29251
2007-10-24 10:03:11 +00:00
Paul Gilbert
6faff895c3 Changed text speed flag, and added saving of it to savegames
svn-id: r29250
2007-10-24 10:01:55 +00:00
Paul Gilbert
f1958a2218 Removed deprecated YNKeyStruct structure
svn-id: r29237
2007-10-21 05:13:44 +00:00
Paul Gilbert
1aab730e6b Finally got the room layering to work correctly
svn-id: r29236
2007-10-20 22:35:23 +00:00
Paul Gilbert
8ec0e447c2 Added support for setting animations by their index rather than their offset, allowing for easier multi-language support. Also fixed translation of inventory window
svn-id: r29169
2007-10-07 11:12:46 +00:00
Paul Gilbert
d817f530e8 Changed string constant name to avoid clashing with inventory display constants
svn-id: r29168
2007-10-07 11:11:06 +00:00
Paul Gilbert
09d706481b Added loading of new give talk Id list
svn-id: r29167
2007-10-07 11:09:20 +00:00