Commit Graph

502 Commits

Author SHA1 Message Date
Travis Howell
11f2d4052a Update quick load code for Elvira 1/2 and Waxworks, based on original scripts.
svn-id: r26884
2007-05-20 08:30:43 +00:00
Travis Howell
c80aa94091 Add dissolve code for Elvira 2 and Waxworks.
svn-id: r26881
2007-05-20 04:47:12 +00:00
Travis Howell
6302acf523 Completely revert last changes in icon code.
svn-id: r26859
2007-05-17 09:02:01 +00:00
Travis Howell
d4191508f6 Cleanup.
svn-id: r26858
2007-05-17 09:00:14 +00:00
Travis Howell
565d0d0a7d Add code to slowing kill the demon in DIMP.
svn-id: r26857
2007-05-17 07:23:56 +00:00
Travis Howell
b3c582e4c7 Ooops, commit too much.
svn-id: r26854
2007-05-16 13:00:38 +00:00
Travis Howell
bf3b58e7cf Add code for handling special walls in Elvira 1/2.
svn-id: r26853
2007-05-16 12:58:47 +00:00
Travis Howell
2783526b71 Fix inventory icons in Amiga/AtariST versions of Elvira 1.
svn-id: r26852
2007-05-16 10:03:02 +00:00
Travis Howell
22e3afc409 Ooops, correct inheritance of load/save functions.
svn-id: r26851
2007-05-16 09:39:36 +00:00
Travis Howell
27b56c23f6 Add caption to saved games for Elvira 1/2 and Waxworks.
svn-id: r26850
2007-05-16 08:27:15 +00:00
Travis Howell
a91f7e025c Fix regression in Simon the Sorcerer 1/2, that caused various glitches.
svn-id: r26849
2007-05-16 06:36:43 +00:00
Travis Howell
bdb18c60d8 Add idle code for DIMP.
svn-id: r26848
2007-05-16 05:57:26 +00:00
Travis Howell
73749ddafa Minor cleanup.
svn-id: r26845
2007-05-15 13:01:36 +00:00
Travis Howell
dc9d36ea4a Fix fade regressions.
svn-id: r26844
2007-05-15 11:32:11 +00:00
Travis Howell
ee0cb9ee2d Ooops, the y offset in drawBackGround() should be based on state width too.
svn-id: r26843
2007-05-15 07:14:12 +00:00
Travis Howell
2371b4ec03 Fix regressions in the introduction of Simon the Sorcerer 1 and in the DOS Floppy demo of Simon the Sorcerer 1.
svn-id: r26842
2007-05-15 07:08:24 +00:00
Travis Howell
2e53712d31 Correct error in drawImages(), where _window3Flag should have been used.
svn-id: r26839
2007-05-14 00:00:36 +00:00
Travis Howell
a8c6dc6e7d Cleanup.
svn-id: r26833
2007-05-13 13:19:46 +00:00
Travis Howell
b1a95b502d Fix reported compiler warning.
svn-id: r26828
2007-05-13 11:07:00 +00:00
Travis Howell
9a04d1dffb Rename a few variables.
svn-id: r26827
2007-05-13 10:07:55 +00:00
Travis Howell
da283175c4 Correct delay for animateSprite event in Simon the Sorcerer 2.
svn-id: r26826
2007-05-13 09:55:15 +00:00
Travis Howell
b6672f37a9 Fix bugs #941074 and #828860, by switching to graphics renderer code used by earlier (non-Windows) versions of Simon the Sorcerer 1/2.
svn-id: r26825
2007-05-13 08:46:48 +00:00
Travis Howell
aa89759a55 Trigger palette update in colorWindow() for Elvira 2.
svn-id: r26824
2007-05-13 05:58:18 +00:00
Travis Howell
1ef7c3dbad Fix bug in original Simon the Sorcerer 2, the x position in invertBox() needs to be adjusted for scrolling locations.
svn-id: r26823
2007-05-13 04:11:19 +00:00
Gregory Montoir
1eef4cc779 free decrunch buffer once protracker module is loaded
svn-id: r26822
2007-05-13 02:32:38 +00:00
Travis Howell
6452a701be Fix glitches in pause options of Elvira 1.
svn-id: r26796
2007-05-10 00:43:27 +00:00
Filippos Karapetis
24fa689ee0 Fix compilation with MSVC8
svn-id: r26793
2007-05-09 15:48:18 +00:00
Travis Howell
20bf83a2ce Imrproved support for Elvira 1/2 and Waxworks.
svn-id: r26792
2007-05-09 15:36:05 +00:00
Travis Howell
5c3f6721b8 Fix masking issues in Amiga versions of Simon the Sorcerer 1.
svn-id: r26787
2007-05-08 14:48:46 +00:00
Filippos Karapetis
f21a7648aa Fix compilation with MSVC8
svn-id: r26784
2007-05-08 07:16:58 +00:00
Travis Howell
ce70442c2e Add palette difference when drawing images in Elvira 1.
svn-id: r26783
2007-05-08 05:39:50 +00:00
Travis Howell
3a4c4fa181 Don't attempt to decode unknown icon data formats.
svn-id: r26781
2007-05-07 13:40:29 +00:00
Travis Howell
d5504f0b66 The Palette difference in inventory arrows, applies to AGA version of Simon the Sorcerer 1 too.
svn-id: r26780
2007-05-07 13:09:10 +00:00
Travis Howell
9547535bd2 Fixes for conversation response in Waxworks.
svn-id: r26779
2007-05-07 13:03:02 +00:00
Travis Howell
e2c40aaee6 Fix inventory palette glitches in Elvira 2.
svn-id: r26775
2007-05-07 08:47:40 +00:00
Travis Howell
425bd5c136 Fix bug #1714096 - DIMP: Unable to start (regression).
svn-id: r26774
2007-05-07 08:29:29 +00:00
Travis Howell
8c21d430bb Fix inventory movement in Elvira 1/2 and Waxworks.
svn-id: r26773
2007-05-07 06:30:51 +00:00
Travis Howell
3ad8770f96 Set exact variable sizes for VC10 state, to avoid more regressions.
svn-id: r26770
2007-05-07 03:40:37 +00:00
Travis Howell
1a69604e82 Cleanup.
svn-id: r26769
2007-05-07 01:11:10 +00:00
Travis Howell
6ddc79a9a8 Cleanup.
svn-id: r26759
2007-05-06 09:46:43 +00:00
Travis Howell
0da4791128 Fix regression due to sign issue, which could cause crashes.
svn-id: r26758
2007-05-06 09:35:08 +00:00
Travis Howell
76c98a03af Fix regression that caused input to fail, after load or save error occurs.
svn-id: r26756
2007-05-06 09:31:32 +00:00
Travis Howell
da2d6b64af Add code difference for inventory arrows in Amiga versions of Simon the Sorcerer 1.
svn-id: r26641
2007-04-28 07:00:33 +00:00
Max Horn
5bf7b78aa2 Renamed agosgame.cpp -> detection_tables.h
svn-id: r26634
2007-04-27 22:42:02 +00:00
Max Horn
fbc2f89b08 Renamed some game.cpp files to detection.cpp
svn-id: r26623
2007-04-27 20:26:54 +00:00
Max Horn
d4660cce55 Removing more semicola
svn-id: r26597
2007-04-26 19:08:53 +00:00
Travis Howell
913a00ef93 Update details for Russian translation of Simon the Sorcerer 1.
svn-id: r26543
2007-04-18 09:42:13 +00:00
Travis Howell
69828cf56c Fix mouse regression in Swampy Adventures.
svn-id: r26503
2007-04-15 14:43:23 +00:00
Travis Howell
5668e15b2e Update reporting of invalid script opcodes.
svn-id: r26501
2007-04-15 14:32:58 +00:00
Travis Howell
7fad7c6f3f Fix Elvira 1 regression.
svn-id: r26500
2007-04-15 14:23:23 +00:00
Travis Howell
b932d60251 Cleanup.
svn-id: r26497
2007-04-15 14:12:08 +00:00
Travis Howell
48c21a1e31 Add eriktorbjorn's patch to split script opcodes into specific game engines.
svn-id: r26490
2007-04-15 12:04:47 +00:00
Travis Howell
95661d65af Cleanup.
svn-id: r26482
2007-04-15 05:33:21 +00:00
Travis Howell
2d3e77db85 Split game engines, to allow further cleanups.
svn-id: r26481
2007-04-15 05:04:48 +00:00
Travis Howell
1c00843f2b Cleanup.
svn-id: r26480
2007-04-15 00:55:16 +00:00
Travis Howell
aa0f36358b Cleanup.
svn-id: r26479
2007-04-15 00:21:42 +00:00
Travis Howell
fe6b6323fa Cleanup.
svn-id: r26478
2007-04-15 00:12:09 +00:00
Max Horn
2d2b3d0ed2 Renamed AGOSEngine::midi to AGOSEngine::_midi
svn-id: r26468
2007-04-14 12:03:46 +00:00
Travis Howell
f587f40c22 Correct details for Simon the Sorcerer 2 (DOS Floppy) with Russian patch.
svn-id: r26449
2007-04-10 05:17:54 +00:00
Travis Howell
0a766e5786 Remove two invalid entries for Simon the Sorcerer 2, since they use md5 checksums of the complete files (based on ICON.DAT).
svn-id: r26448
2007-04-10 05:16:01 +00:00
Gregory Montoir
5aca9dce8c added the instance of EventManager returned by OSystem::getEventManager as a member of the Engine base class. This allows to simply the code a bit and should more efficient too (ie. less virtual function chain calls, obj->getA()->getB()). Also updated several engines to make use of it.
svn-id: r26357
2007-04-01 17:36:13 +00:00
Travis Howell
a8f9e399b8 Add Spanish version of Waxworks (DOS).
svn-id: r26273
2007-03-22 00:53:39 +00:00
Travis Howell
3e85ecbe5f Remove duplicate code, for clipping of mouse position.
svn-id: r26238
2007-03-19 00:24:58 +00:00
Max Horn
dd61b25634 More AGOSEngine::waitForInput refactoring
svn-id: r26218
2007-03-18 17:55:11 +00:00
Max Horn
8bf7953839 Refactoring AGOSEngine::waitForInput some more (in baby steps, so that if I break something, it'll be easier to figure out at which point I did it :)
svn-id: r26210
2007-03-18 14:33:13 +00:00
Max Horn
612e7a3eeb Refactoring AGOSEngine::waitForInput a bit (by resolving gotos)
svn-id: r26207
2007-03-18 13:53:51 +00:00
Max Horn
72ee9ee86a Changed AGOS to use the EventManager to track the mouse position; added a FIXME comment about _mouseOld never being set
svn-id: r26206
2007-03-18 13:29:12 +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
Torbjörn Andersson
53624376b4 Applied my re-revised patch #1487149 ("Simplified keyboard repeat"), with
Fingolfin's blessings. Keyboard repeat is now handled by the event manager,
rather than by individual engines.

Since this can cause problems with some engines (see the AGI engine), the extra
"key down" events are marked as "synthetic", so that they can be ignored if
necessary.

svn-id: r26170
2007-03-17 15:44:26 +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
Travis Howell
247117d9ba Update error messages in loadModule().
svn-id: r26131
2007-03-14 12:34:40 +00:00
Max Horn
728d01cb17 Removing some unnecessary #includes
svn-id: r26044
2007-03-09 23:46:45 +00:00
Travis Howell
7380142071 Change the volume of music channel of mixer, when adjusting music volume too.
svn-id: r25894
2007-02-27 11:47:28 +00:00
Travis Howell
08fc65bef9 Add demo of Waxworks.
svn-id: r25876
2007-02-26 07:13:54 +00:00
Max Horn
b3931a847d Trying to unify the order in which we try the various audio formats: Prefer FLAC (lossless) over Ogg Vorbis ('free') over MP3 -- the order is admittedly somewhat arbitrary, but at least now it's consistent across all parts of ScummVM
svn-id: r25837
2007-02-24 23:40:28 +00:00
Travis Howell
b0805551e7 Update md5 details for Spanish version of Elvira 2.
svn-id: r25818
2007-02-24 12:38:18 +00:00
Travis Howell
b8bbe1b5fe Update copy protection bypass for Simon 1/2.
svn-id: r25809
2007-02-23 11:12:12 +00:00
Travis Howell
74f21c1c4f Correct typo.
svn-id: r25808
2007-02-23 10:19:53 +00:00
Travis Howell
47280b3301 Fix bug #1600999 - SIMON2: Crash while talking to Bingo Bongo. A regression due to the work around for extra long strings been broken, when support for the Feeble Files was added in the past.
svn-id: r25807
2007-02-23 10:18:14 +00:00
Travis Howell
87ef1fe0a2 Skip music track 35 in CD releases of Simon 1, since it was replace by sound effect and the script was not updated.
svn-id: r25762
2007-02-21 12:34:14 +00:00
Travis Howell
76ac2263f9 Remove Amiga OCS specific code for copy protection screen in Simon 1, since it no longer required.
svn-id: r25761
2007-02-21 12:33:34 +00:00
Travis Howell
29ada82134 Bypass the copy protection screens in floppy disk releases of Simon the Sorcerer 1 and 2, with permission from Adventure Soft.
svn-id: r25760
2007-02-21 11:46:35 +00:00
Travis Howell
b5b45131c2 White space changes.
svn-id: r25759
2007-02-21 10:43:11 +00:00
Travis Howell
7f31211e4f Update details for English version of Elvira 2 for Atari ST.
svn-id: r25736
2007-02-20 03:06:42 +00:00
Travis Howell
2673ddffc0 Add French version of Elvira 2 for Amiga.
svn-id: r25735
2007-02-20 01:22:41 +00:00
Travis Howell
55162ff920 Correct playing back music 0 in Simon the Sorcerer 1, when using replacment soundtrack.
svn-id: r25734
2007-02-19 23:51:32 +00:00
Torbjörn Andersson
301fe91903 Renamed ANIMATION_H to AGOS_ANIMATION_H.
svn-id: r25730
2007-02-19 20:55:16 +00:00
Max Horn
d0f6b3c0dc Using stat and fopen is not portable (writing to a Common::File isn't either, but at least it doesn't force porters to #define fopen to work around it)
svn-id: r25661
2007-02-17 20:37:57 +00:00
Max Horn
b8aeefaffb Added finalize() method to Common::OutSaveFile (which by default just flushes the stream), changed engines to call that before deleting OutSaveFile instances (instead of just flushing)
svn-id: r25660
2007-02-17 18:55:51 +00:00
Torbjörn Andersson
7949a067e1 Removed extra tabs.
svn-id: r25640
2007-02-17 00:54:32 +00:00
Torbjörn Andersson
16e7a12878 Some very obvious cleanups.
svn-id: r25635
2007-02-16 17:13:29 +00:00
Max Horn
d849f4762c a 20ms second delay should be ample time for a GM system ON
svn-id: r25633
2007-02-16 16:34:02 +00:00
Travis Howell
e3594a6839 Add support for using soundtrack from the Simon the Sorcerer 1 - Music Enhancement Project.
svn-id: r25632
2007-02-16 13:55:01 +00:00
Max Horn
cfc3d0a8ed AGOS: Send GM System Enable/On upon startup
svn-id: r25631
2007-02-16 13:41:38 +00:00
Travis Howell
8f0a3e8961 Fix cursor palette regression in Simon the Sorcerer 1.
svn-id: r25625
2007-02-16 10:36:33 +00:00
Travis Howell
3aaf15938d Fix cursor palette regression in Simon the Sorcerer 1.
svn-id: r25624
2007-02-16 10:33:37 +00:00
Torbjörn Andersson
f4b4a30327 Removed unnecessary #include.
svn-id: r25587
2007-02-14 17:05:58 +00:00
Travis Howell
ddef4db34e Fix missing scenes (accolade logo) in AtariST demo of Elvira 1.
svn-id: r25583
2007-02-14 04:15:37 +00:00
Max Horn
7572d2b4f2 Changed detectBestMatchingGame to return a pointer to a ADGameDescription (or a subclass of it); added a (currently fake) fallback callback entry in ADParams
svn-id: r25574
2007-02-13 23:37:44 +00:00
Torbjörn Andersson
c2972f09c2 Whitespace changes.
svn-id: r25567
2007-02-13 21:41:43 +00:00