libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 18:02:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,427 Commits 5 Branches 5 Tags 1.8 GiB
bb0c765731
Commit Graph

607 Commits

Author SHA1 Message Date
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
Paul Gilbert
8ff665c58f Replaced incorrect key constants being used for fight commands 
svn-id: r29166
 2007-10-07 11:07:45 +00:00
Paul Gilbert
d0d454c5da Added new string Ids used for inventory display 
svn-id: r29165
 2007-10-07 11:06:48 +00:00
Paul Gilbert
199e60b9a0 Finally tracked down a bug that sometimes caused word wrapping to fail 
svn-id: r29164
 2007-10-07 11:05:09 +00:00
Paul Gilbert
cb2f6ce092 Fixed action lists to sort correctly for non-English languages 
svn-id: r29144
 2007-09-30 12:35:37 +00:00
Paul Gilbert
106b7eb839 Fix load offset for straw fire, and added proper cross-language handling of initial talks to strangers 
svn-id: r29137
 2007-09-30 10:53:40 +00:00
Paul Gilbert
b7c7623930 Added cross-language handling for the top menu 
svn-id: r29136
 2007-09-30 10:51:33 +00:00
Paul Gilbert
c5edcaa2ef Wrapped access to the playing sounds list in a mutex 
svn-id: r29114
 2007-09-28 07:55:02 +00:00
Paul Gilbert
6107a9f824 Added missing endian wrappers from Room Exit structure loading 
svn-id: r29082
 2007-09-24 00:32:24 +00:00
Johannes Schickel
63d59b2ee6 Changes some code to use Common::set_to instead of loops. (as an example on how to use Common::set_to) 
svn-id: r29081
 2007-09-24 00:08:18 +00:00
Paul Gilbert
b4cff6b9bd Converted fields in data that were originally offsets (such as tick proc offsets) to use indexes, allowing for more generic handling of different language versions 
svn-id: r29073
 2007-09-23 22:17:57 +00:00
Paul Gilbert
8685b1b456 Added vaildation of new lure.dat file, and added MD5 for Italian version of game 
svn-id: r29072
 2007-09-23 22:16:46 +00:00
Paul Gilbert
ffa264b9f7 Added support for the lure.dat file now containing multiple language versions 
svn-id: r29071
 2007-09-23 22:15:22 +00:00
Paul Gilbert
01bfaaa765 Split up the interruptableDelay method into two methods, making the version in events.cpp more generic 
svn-id: r29070
 2007-09-23 22:14:45 +00:00
Paul Gilbert
155d85b3b6 Removed some old redundant code and moved some string constants to the resource file 
svn-id: r29069
 2007-09-23 22:13:41 +00:00
Paul Gilbert
532ae68aa2 Tweaked the colour fading code so that room 4 will display correctly 
svn-id: r29068
 2007-09-23 22:12:37 +00:00
Paul Gilbert
59e9e25a5f Added support for original copy protection, in any anyone ever wants to see it 
svn-id: r29067
 2007-09-23 22:11:14 +00:00
Paul Gilbert
9d07c3a4c5 Shifted string decoder list to a resource, since it varies from language to language 
svn-id: r29066
 2007-09-23 22:10:29 +00:00
Paul Gilbert
f0f813b824 Added support for original copy protection, in any anyone ever wants to see it 
svn-id: r29065
 2007-09-23 22:09:25 +00:00
Torbjörn Andersson
f4507e71d3 Indentation. 
svn-id: r29057
 2007-09-23 16:48:33 +00:00
Max Horn
f7590de0aa Fix endian bug 
svn-id: r29047
 2007-09-23 12:11:05 +00:00
Max Horn
3cbf4ad98f Remove superfluous trailing dot (and that error message really is a lie, the docs don't mention lure.dat :) 
svn-id: r28981
 2007-09-20 08:50:46 +00:00
Torbjörn Andersson
828158a82a I'm probably being overly paranoid, but I'm nervous about initializing an array 
of boolean with memset(). Maybe it's perfectly fine and healthy, but using a
loop is consistent with how we do it in killSounds() anyway.

svn-id: r28979
 2007-09-20 04:13:37 +00:00
Torbjörn Andersson
4c4d4e7b15 Fixed out-of-bounds writing in killSounds(). 
svn-id: r28978
 2007-09-20 04:09:55 +00:00
Eugene Sandulenko
77eea722af Modified patch #1738058: "Action recorder". 
svn-id: r28968
 2007-09-19 13:55:05 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated. 
svn-id: r28966
 2007-09-19 08:40:12 +00:00
Max Horn
c3d3aebe87 Patch #1768757: Merge fsnode-gsoc into trunk (MAJOR change, will break compilation on some ports) 
svn-id: r28944
 2007-09-18 20:02:04 +00:00
Paul Gilbert
e4c51dfe75 Fix to make characters face upwards initially, and to stand straight when not actively moving 
svn-id: r28920
 2007-09-16 08:03:18 +00:00
Paul Gilbert
0a7a1f4283 Bugfix to prevent actions being paused sometimes 
svn-id: r28919
 2007-09-16 04:31:15 +00:00
Paul Gilbert
b2e97060ad Initial sound implementation 
svn-id: r28917
 2007-09-16 04:06:49 +00:00
Paul Gilbert
041bb546c6 Bugfix to keep language strings in memory across restarts 
svn-id: r28916
 2007-09-16 04:05:56 +00:00
Paul Gilbert
f1e9fa1f5e Tweaked animation frame delay to better match original game 
svn-id: r28915
 2007-09-16 04:04:49 +00:00
Paul Gilbert
a19f337a0c Changed ManagedList to make it more thread safe 
svn-id: r28914
 2007-09-16 04:03:50 +00:00
Max Horn
4a302b25ad Lots of source code formatting corrections 
svn-id: r28887
 2007-09-10 13:17:20 +00:00
Max Horn
efbef7880b Fixed code formatting (hanging braces); added static/const keywords to data tables; merged Hotspot::doLookAt and doLookThrough code 
svn-id: r28880
 2007-09-08 11:18:35 +00:00
Paul Gilbert
ca96ba431c Completed the restart/restore dialog screen and functionality 
svn-id: r28714
 2007-08-25 06:08:02 +00:00
Paul Gilbert
5fd1bf64f2 Bugfix to prevent animations nuking the GUI element palette entries 
svn-id: r28713
 2007-08-25 06:06:18 +00:00
Paul Gilbert
234c2a5770 Fixed up several sound system script methods 
svn-id: r28712
 2007-08-25 06:03:24 +00:00
Travis Howell
9a9f801e93 Remove left over debug ocde. 
svn-id: r28555
 2007-08-12 12:26:46 +00:00
Torbjörn Andersson
84dbc41e47 Fixed warning. 
svn-id: r28553
 2007-08-12 11:39:02 +00:00
Paul Gilbert
04f2c4e1e4 Added missing calls to the sound system 
svn-id: r28552
 2007-08-12 11:19:01 +00:00
Paul Gilbert
2f1c5a47db Added code fragment that can change the resource Id to change depending on whether inside/outside 
svn-id: r28551
 2007-08-12 11:17:48 +00:00
Paul Gilbert
9a9d0cb0a5 Cleaned up structures for room exit joins 
svn-id: r28550
 2007-08-12 11:16:43 +00:00
Paul Gilbert
4cf99284a7 Added missing calls to the sound system 
svn-id: r28549
 2007-08-12 11:15:36 +00:00
Paul Gilbert
81fa23f091 Skeleton code added for restart/restore screen 
svn-id: r28548
 2007-08-12 11:15:06 +00:00
Paul Gilbert
48499f3a52 Added accelerated tick calls during room loads 
svn-id: r28547
 2007-08-12 11:14:23 +00:00
Paul Gilbert
e1fd529679 Added new resource identifiers and incremented required data version 
svn-id: r28546
 2007-08-12 11:10:44 +00:00
Paul Gilbert
c247257721 Added part of the framework for playing sounds 
svn-id: r28545
 2007-08-12 11:08:44 +00:00
Paul Gilbert
52292983b0 Skeleton code added for restart/restore screen 
svn-id: r28544
 2007-08-12 11:07:44 +00:00
David Corrales
6856535010 Merged fsnode with trunk: r27971:28460 
svn-id: r28462
 2007-08-05 19:34:20 +00:00
Paul Gilbert
ec1803f838 Removed unused fields 
svn-id: r28458
 2007-08-05 03:26:00 +00:00
Paul Gilbert
d03e3e9c87 Added code for hotspot fields I didn't originally understand 
svn-id: r28457
 2007-08-05 02:56:51 +00:00
Paul Gilbert
cfff436ca7 Added proper room change fading effect 
svn-id: r28212
 2007-07-26 10:11:31 +00:00
David Corrales
9bfe5d5354 Merged the FSNode branch with trunk r27681:27969 
svn-id: r27970
 2007-07-08 16:58:54 +00:00
Max Horn
e1bcd70436 Re-added __attribute__(packed) 
svn-id: r27830
 2007-07-01 18:18:43 +00:00
David Corrales
7091babe4d Missed some files in the branch/trunk merge. 
svn-id: r27682
 2007-06-23 19:04:15 +00:00
David Corrales
cacd7a28fd Merged the FSNode branch with trunk r27031:27680 
svn-id: r27681
 2007-06-23 18:51:33 +00:00
Max Horn
6ef494ab28 Converted LURE code to use KEYCODEs 
svn-id: r27668
 2007-06-23 14:59:58 +00:00
Max Horn
2fa0a5c457 Cleaning up after myself (I blame it on, err, uhh... the Vogons?) 
svn-id: r27625
 2007-06-22 21:16:07 +00:00
Max Horn
54d668ac13 Changed more code to use Common::KEYCODE_ enum 
svn-id: r27624
 2007-06-22 21:10:57 +00:00
Torbjörn Andersson
73f760becd Don't include sdl_keysym.h. Use our Common::KEYCODE constants instead of SDLK 
constants.

svn-id: r27609
 2007-06-22 12:42:28 +00:00
Paul Gilbert
47bd4e500b Removed old debug input files no longer being used, and the Lure disassembly folder 
svn-id: r27608
 2007-06-22 12:40:30 +00:00
Paul Gilbert
5cb367681b Added entries for fights.cpp and sound.cpp 
svn-id: r27607
 2007-06-22 12:36:49 +00:00
Paul Gilbert
8b3821e9ff Lots of bugfixes - game is now completable 
svn-id: r27606
 2007-06-22 12:36:04 +00:00
Paul Gilbert
707e62e669 Implemented remaining script methods 
svn-id: r27605
 2007-06-22 12:31:27 +00:00
Paul Gilbert
5e92ea378f Initial commit 
svn-id: r27604
 2007-06-22 12:30:18 +00:00
Paul Gilbert
b923618844 Added extra information to some methods, and a new method to show an animation sequence 
svn-id: r27603
 2007-06-22 12:26:10 +00:00
Max Horn
c7c2cb498c Simplified LURE detection code a little bit 
svn-id: r27466
 2007-06-16 16:44:33 +00:00
David Corrales
0cab5b7791 Merged the fs branch with trunk. r26949:27031 
svn-id: r27032
 2007-05-31 23:44:43 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots 
svn-id: r27024
 2007-05-30 21:56:52 +00:00
Paul Gilbert
5af5c3b0a7 Impelemented game as far as dragon cave entrance 
svn-id: r26994
 2007-05-28 11:38:57 +00:00
Paul Gilbert
75e87b4c8b Added saving of scheduled scripts, and set script activation times to match original game 
svn-id: r26993
 2007-05-28 11:38:10 +00:00
Paul Gilbert
5e0fd79a5a Implemented new script methods 
svn-id: r26992
 2007-05-28 11:36:59 +00:00
Paul Gilbert
30142129c0 Added saving of scheduled scripts, and set script activation times to match original game 
svn-id: r26991
 2007-05-28 11:36:08 +00:00
Paul Gilbert
6a1290a1d3 Reworked game saving so that restored games don't fire off hotspot activation scripts, and conversation bugfix to keep characters in place 
svn-id: r26955
 2007-05-27 04:33:19 +00:00
Paul Gilbert
8740e81d1f Bugfix to save whether each NPC has been identified, and correctly transform back from Selena 
svn-id: r26935
 2007-05-25 22:59:24 +00:00
Paul Gilbert
26b221a701 Added savegame code so characters correctly leave rooms after restoring a game 
svn-id: r26888
 2007-05-20 13:07:44 +00:00
Paul Gilbert
56bb400ef9 Fixed several room change, NPC behaviour, and door closing code 
svn-id: r26887
 2007-05-20 12:39:15 +00:00
Paul Gilbert
4a40ecb4df Added saving of the room walkable paths 
svn-id: r26883
 2007-05-20 07:25:53 +00:00
Paul Gilbert
8be618fb47 Bugfix to constrain savegame names to the dialog width 
svn-id: r26882
 2007-05-20 07:24:05 +00:00
Paul Gilbert
9631586ce8 Added code responsible for transforming the player back from Selena 
svn-id: r26778
 2007-05-07 12:17:24 +00:00
Paul Gilbert
6a7b74d99d Reworked the pathfinder to directly return a pathfinding result, and added code to save the pathfinding state to a save game when it's in progress 
svn-id: r26777
 2007-05-07 12:16:05 +00:00
Paul Gilbert
d2e56f7b66 Added saving of room exit join data in savefiles 
svn-id: r26776
 2007-05-07 12:10:32 +00:00
Paul Gilbert
643735e8a4 Bugfix for random destination setting so NPCs don't walk outside the valid walkable areas of a room 
svn-id: r26747
 2007-05-05 01:00:01 +00:00
Paul Gilbert
91fb83a72f Bugfix to prevent characters stopped by a right-hand non-walkable area then being able to walk through it 
svn-id: r26744
 2007-05-04 09:16:55 +00:00
Paul Gilbert
aba02a6811 Bugfix for characters freezing after talking when in a different room than the player, and fixed NPC to NPC conversations 
svn-id: r26740
 2007-05-03 05:06:10 +00:00
Paul Gilbert
ab78c626f4 Fix for saving the game when an NPC is doing a non-scripted action 
svn-id: r26734
 2007-05-02 03:18:11 +00:00
Paul Gilbert
d449697aa5 Cleaned up the script engine opcodes, added debug names for recently added script methods, and bugfix to method that was causing a crash in the first room 
svn-id: r26681
 2007-04-30 07:58:09 +00:00
Paul Gilbert
2cb3b5a9c6 Added NPC to NPC talk action, and a bugfix for when remote viewing a room 
svn-id: r26680
 2007-04-30 07:56:45 +00:00
Paul Gilbert
885f687ae5 Reworked hotspot actions so that talking to characters work properly 
svn-id: r26675
 2007-04-29 11:30:29 +00:00
Max Horn
960f7cd75a Moved lure detection code into a new detection.cpp file 
svn-id: r26625
 2007-04-27 20:32:09 +00:00
Max Horn
d4660cce55 Removing more semicola 
svn-id: r26597
 2007-04-26 19:08:53 +00:00
Paul Gilbert
307506df9c General bugfixes, added animation handlers for creating potion and freeing Goewin, and in-progress work on completing original game's action precheck code 
svn-id: r26572
 2007-04-22 22:42:01 +00:00
Paul Gilbert
fdea5abb34 Added code to prevent NPCs from moving when being talked to 
svn-id: r26546
 2007-04-19 06:46:56 +00:00
Paul Gilbert
f9a32ff7d2 Bugfix for Grub's animation handler 
svn-id: r26538
 2007-04-17 03:48:51 +00:00
Paul Gilbert
23a86ea571 Bugfix to have multiple savegame names list vertically 
svn-id: r26537
 2007-04-17 03:47:47 +00:00
Paul Gilbert
258ab37a9a Altered message display to correctly handle optional display of hotspot/character article prefixes 
svn-id: r26491
 2007-04-15 12:12:21 +00:00
Paul Gilbert
2d617677df Bugfix to have Ratpouch correctly follow player, and new object animation handlers added 
svn-id: r26487
 2007-04-15 10:49:59 +00:00
Paul Gilbert
3586004c96 Bugfix to restore the correct part of the screen when the menu changes 
svn-id: r26486
 2007-04-15 10:44:37 +00:00
Paul Gilbert
e01efe4004 Added new script methods 
svn-id: r26485
 2007-04-15 10:43:31 +00:00
Travis Howell
c838ae690b Fix a few Valgrind warnings. 
svn-id: r26484
 2007-04-15 08:34:53 +00:00
Paul Gilbert
98bd127504 Gave proper names to previously unknown/partially-known constants 
svn-id: r26467
 2007-04-14 11:00:29 +00:00
Torbjörn Andersson
099ffb9cf0 Fixed warning. 
svn-id: r26466
 2007-04-14 05:02:12 +00:00
Paul Gilbert
68225f7896 Implemented handling for barmen (rooms 29, 32, and 35) 
svn-id: r26464
 2007-04-14 03:48:24 +00:00
Paul Gilbert
8be6153533 Added script method for barmen serving player 
svn-id: r26463
 2007-04-14 03:46:30 +00:00
Paul Gilbert
a35e5a42be Adjusted word wrapping width in talk dialogs 
svn-id: r26457
 2007-04-13 03:34:20 +00:00
Paul Gilbert
a2db95daee Bugfix to prevent a used item in give actions from not getting pased to the talk dialog for display 
svn-id: r26447
 2007-04-10 03:20:50 +00:00
Paul Gilbert
89a29e32bf Added in more character tick handlers 
svn-id: r26368
 2007-04-02 06:03:47 +00:00
Paul Gilbert
5a313074bc Bugfix to correctly remove an item from a character's inventory when it is deactivated 
svn-id: r26338
 2007-04-01 11:48:54 +00:00
Paul Gilbert
3abdfa46f9 Bugfix for strings that wrapped near a carriage return character 
svn-id: r26337
 2007-04-01 11:47:35 +00:00
Max Horn
ed54ea9155 Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again 
svn-id: r26180
 2007-03-17 19:02:05 +00:00
Max Horn
15d9bc42ea Force all code to use EventManager::pollEvent instead of OSystem::pollEvent 
svn-id: r26156
 2007-03-17 00:53:21 +00:00
Max Horn
a6f3ed8173 Got rid of Lure::System 
svn-id: r26155
 2007-03-17 00:39:18 +00:00
Paul Gilbert
c4260e7d8f Added support for Blacksmith's hammering animation and added Morkus' animation handler 
svn-id: r26003
 2007-03-06 08:24:52 +00:00
Paul Gilbert
41574458fc Added animation handler for standard characters that can be talked to 
svn-id: r25888
 2007-02-26 22:56:02 +00:00
Paul Gilbert
4f8c66b4cc Added saving of the random actions set state, and implemented NPC opcode 29, which allows for an NPC to be given a custom talk record 
svn-id: r25875
 2007-02-26 02:50:23 +00:00
Paul Gilbert
0c899f82ab Syntax fixes to conform to ScummVM coding standards 
svn-id: r25781
 2007-02-22 08:17:41 +00:00
Paul Gilbert
7ac767a2ba Added proper support for the random actions your sidekick can do in each room 
svn-id: r25780
 2007-02-22 06:29:09 +00:00
Max Horn
348b72e107 Improved (I hope) the 'Unknown MD5' messages in our detectors a little bit 
svn-id: r25695
 2007-02-18 18:07:32 +00:00
Paul Gilbert
6e0c500bc1 Added line to ensure the current room number field variable is kept up to date 
svn-id: r25648
 2007-02-17 03:42:43 +00:00
Paul Gilbert
c4cbf9dc92 Added some asserts to setSupportData method to ensure the passed variables are valid 
svn-id: r25647
 2007-02-17 03:41:41 +00:00
Paul Gilbert
409657cc15 Added animation handler for Catriona (woman in Smithy) 
svn-id: r25638
 2007-02-16 23:17:00 +00:00
Paul Gilbert
5bd19f022a Added sub-option to hotspot command to allow the activation or deactivation of hotspots 
svn-id: r25622
 2007-02-16 04:50:42 +00:00
Paul Gilbert
75c74574e8 Bugfix to pathfinder that resulted in some characters bouncing between two rooms 
svn-id: r25621
 2007-02-16 04:49:15 +00:00
Paul Gilbert
97bb233663 Revised previously committed guard to comply to ScummVM coding standard 
svn-id: r25620
 2007-02-16 03:49:34 +00:00
Max Horn
62bd2a1544 Make use of md5_file_string 
svn-id: r25593
 2007-02-14 21:59:57 +00:00
Paul Gilbert
31c0cb7f13 Added proper support for showing a hotspot or character's name in dialogs where the message contains a placeholder mark for it 
svn-id: r25582
 2007-02-14 02:37:53 +00:00
Paul Gilbert
2ef15f51a7 Added guard to prevent crashing if a hospot or character name is needed and was not provided 
svn-id: r25581
 2007-02-14 02:35:48 +00:00
Paul Gilbert
64fb3fad3f Bugfix to clipping so player's feet aren't visible in the corner of the screen as the chute is exited 
svn-id: r25455
 2007-02-10 03:45:06 +00:00
Max Horn
81ec51b8f7 Turned two comments into doxygen comments 
svn-id: r25451
 2007-02-09 17:47:55 +00:00
Max Horn
a49c22290f fix warning 
svn-id: r25450
 2007-02-09 17:17:08 +00:00
Paul Gilbert
3dfd1cbda8 Removed redundant line used during testing 
svn-id: r25443
 2007-02-09 11:03:58 +00:00
Paul Gilbert
a5047b599a Added 'room' command to show room information 
svn-id: r25442
 2007-02-09 10:59:15 +00:00
Paul Gilbert
87b3f2c6d8 Added new flag for blocked characters and extra checking of dynamic support records versus static schedule entry records 
svn-id: r25441
 2007-02-09 10:58:06 +00:00
Paul Gilbert
6391e49ee5 Improved character blocked/bumped handling 
svn-id: r25440
 2007-02-09 10:56:31 +00:00
Paul Gilbert
b79883f3af Removed use of static support data record for player to simplify save process 
svn-id: r25439
 2007-02-09 10:54:55 +00:00
Paul Gilbert
7f41b6914b Removed use of static support data record for player to simplify save process 
svn-id: r25438
 2007-02-09 10:54:07 +00:00
Paul Gilbert
f7958231be Bugfix to fix crash when Ratpouch chooses an in-room random destination 
svn-id: r25333
 2007-02-02 08:35:17 +00:00
Torbjörn Andersson
0a18259d78 Used Fingolfin's workaround for a bogus (?) warning produced by some versions 
of GCC. (Not the one he's using, though, which is why I'm doing this instead.)

svn-id: r25327
 2007-02-01 20:16:32 +00:00
Paul Gilbert
bc9df7e5c9 Added custom load code for room #20 Notice 
svn-id: r25317
 2007-02-01 04:41:36 +00:00
Paul Gilbert
a83be36a97 Expanded the chute animation to display the full sequence as the player leaves the dungeon 
svn-id: r25302
 2007-01-31 02:34:55 +00:00
Paul Gilbert
33707d6e42 Added animation handler for the player exiting the sewer, and some bugfixes to allow Ratpouch to correctly open up the dungeon exit 
svn-id: r25301
 2007-01-31 02:33:20 +00:00
Paul Gilbert
0bd31443f9 Added constants for the dungeon bricks and chute animation resources 
svn-id: r25300
 2007-01-31 02:28:51 +00:00
Paul Gilbert
1996046121 Changed the coveredFlag to have an initial state distinct from true or false 
svn-id: r25299
 2007-01-31 02:28:04 +00:00
Paul Gilbert
9d474d6258 Added check to skip drawing hotspots in layer 1 if their skip flag is set 
svn-id: r25298
 2007-01-31 02:26:16 +00:00
Paul Gilbert
ee606dc143 Added script methods needed for leaving the dungeon 
svn-id: r25297
 2007-01-31 02:24:55 +00:00
Eugene Sandulenko
cd8a5f3a98 First phase of detection-related plugins interface improvements. Now plugins 
return StringMap instead of fixed list of parameters. This adds great
flexibility.

Current patch should not alter any functionality, i.e. if there are regressions,
submit a report. Phase 2 will benefit from these changes and will come later.

svn-id: r25134
 2007-01-20 21:27:57 +00:00
Paul Gilbert
b648aaf64b Bugfix to prevent player freezing in place after bumping into another character 
svn-id: r24688
 2006-11-12 04:42:37 +00:00
Paul Gilbert
0a5b86736c Bugfix to prevent pathfinder failure after making a small step 
svn-id: r24687
 2006-11-12 04:39:10 +00:00
Travis Howell
5c72acb536 Set ROOM_EXIT_ANIMATION constant, to fix compile for now. Not sure if value is correct 
svn-id: r24625
 2006-11-05 08:22:33 +00:00
Paul Gilbert
64817e3887 Added display of the two special between room animations: falling down the chute and hiding in the barrel 
svn-id: r24623
 2006-11-05 06:56:58 +00:00
Paul Gilbert
99655b59d4 Added a save/restore game dialog class 
svn-id: r24071
 2006-10-02 12:49:57 +00:00
Paul Gilbert
1a96e26bf6 Added functionality to allow saving/loading the game state 
svn-id: r24070
 2006-10-02 12:48:56 +00:00
Paul Gilbert
e8623fa477 Added methods for push/pop cursors 
svn-id: r24069
 2006-10-02 12:47:29 +00:00
Max Horn
4c14cf6d1a Moved base/engine.cpp and .h to engines/ (main motivation: helps untangle the linker dependency graph). Porters will have to update project files 
svn-id: r23974
 2006-09-23 00:42:35 +00:00
Max Horn
919092e5fc Overhaul of the debugger code 
* Moved Common::Debuggger to GUI::Debugger (mainly to satisfy linker
  restrictions)
* Change the base Debugger class to *not* be a template class anymore;
  instead, a thin (template based) wrapper class is used to hook up
  debugger commands
* Removed duplicate Cmd_Exit and Cmd_Help methods in favor of a single
  version of each in GUI::Debugger
* New Cmd_Help doesn't word wrap after 39/78 chars, but rather queries
  the console to determine when to wrap
* Debugger::preEnter and postEnter aren't pure virtual anymore

svn-id: r23890
 2006-09-16 16:58:27 +00:00
Max Horn
a2dc897fe5 Reduce code duplication 
svn-id: r23888
 2006-09-16 15:01:14 +00:00
Chris Apers
a851fb353c Make Lure run again on PalmOS fixing unaligned read 
svn-id: r23865
 2006-09-10 16:29:06 +00:00
Johannes Schickel
8271f1f0dc Makes lure compile with msvc8 again. 
svn-id: r23861
 2006-09-10 13:09:04 +00:00
Chris Apers
8b13bce6e9 Fixed compilation 
svn-id: r23836
 2006-09-09 09:09:19 +00:00