Commit Graph

468 Commits

Author SHA1 Message Date
Max Horn
99df028d35 SCUMM: Got rid of o6_invalid
svn-id: r39957
2009-04-16 09:27:02 +00:00
Max Horn
432e7917a5 SCUMM: Switched opcode tables to use Common::Functor0 (a bit like Kyra does it)
svn-id: r39956
2009-04-16 09:26:37 +00:00
Max Horn
6f4b567124 SCUMM: Split intern.h into multiple headers
svn-id: r39567
2009-03-20 16:33:58 +00:00
Max Horn
e080a59337 Renamed SMKPlayer -> SmackerDecoder and DXAPlayer -> DXADecoder, as well as some other tweaks
svn-id: r39255
2009-03-09 03:45:23 +00:00
Willem Jan Palenstijn
7a88744b74 Patch #2671477: Fix wrong usage of strncat
svn-id: r39184
2009-03-07 13:40:00 +00:00
Max Horn
3fcbda829a Merged Engine::go() and ::init() into a new run() method (currently implemented by calling the existing init&go methods; to be cleaned up by engine authors
svn-id: r39002
2009-03-01 04:30:55 +00:00
Max Horn
14c5bbbccf Renamed Archive::openFile to createReadStreamForMember
svn-id: r36021
2009-01-23 04:45:44 +00:00
Travis Howell
f304ee8c19 Remove unused case, which isn't used by HE60-HE71 games.
svn-id: r35832
2009-01-12 03:58:11 +00:00
Travis Howell
936f4c0963 setQuickStartFlag is different value in HE100 games.
svn-id: r35803
2009-01-10 14:10:04 +00:00
Travis Howell
6c27a9f008 Correct sound timer, when sound compression is used in HE games.
svn-id: r35800
2009-01-10 10:38:06 +00:00
Travis Howell
d39c075eaf Fix warning.
svn-id: r35799
2009-01-10 10:36:01 +00:00
Travis Howell
b84c864543 Fix compiling SCUMM engine, with HE71+ games disabled.
svn-id: r35798
2009-01-10 10:31:39 +00:00
Travis Howell
1e29a3c7d8 Correct sound priority and SBNG offsets, in later HE games.
svn-id: r35795
2009-01-09 05:14:56 +00:00
Travis Howell
02f4098a1a Fix bug #2029639 - PAJAMA1: Lip Syncing.
svn-id: r35794
2009-01-09 00:35:04 +00:00
Filippos Karapetis
9752501a07 videoIsLoaded() -> isVideoLoaded()
svn-id: r35777
2009-01-07 22:06:15 +00:00
Filippos Karapetis
9267961104 Updated SCUMM with the latest changes to video players
svn-id: r35759
2009-01-06 17:46:38 +00:00
Travis Howell
a8785eb92e Add support for RIFF sound format in createSound().
svn-id: r35736
2009-01-05 06:45:42 +00:00
Travis Howell
0e9bfc11b0 Fix no input, when playing cards in Blue's 123 Time Activies.
svn-id: r35716
2009-01-04 06:15:01 +00:00
Travis Howell
d0fc28bbd1 Use cache when converting 16bit colors, for faster conversions.
svn-id: r35714
2009-01-04 03:49:23 +00:00
Travis Howell
4670e37a78 Use slow palette color match, for 16bit color HE games for now.
svn-id: r35713
2009-01-04 00:58:45 +00:00
Travis Howell
b820ae126a Add missing src checks in drawWizPolygonTransform().
svn-id: r35703
2009-01-03 14:27:19 +00:00
Travis Howell
1ea42d597f Fix palette glitches in Art Show of Blue's Treasure Hunt.
svn-id: r35691
2009-01-03 09:57:24 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Travis Howell
4b4d752ba1 Add Blue's Treasure Hunt.
svn-id: r35599
2008-12-29 10:03:34 +00:00
Travis Howell
109d55f8d3 Add more stubs for MBC.
svn-id: r35570
2008-12-27 07:17:46 +00:00
Travis Howell
2d3c506d9a Ooops, correct return value.
svn-id: r35569
2008-12-27 06:13:21 +00:00
Travis Howell
f5b61ffd03 Add basic code for wizImage compression type 5.
svn-id: r35568
2008-12-27 06:11:56 +00:00
Travis Howell
56dbde4d57 Fix video playback in Blue's Clues games.
svn-id: r35565
2008-12-27 02:36:08 +00:00
Travis Howell
7d99fbbdf7 Update debug message.
svn-id: r35564
2008-12-26 23:39:13 +00:00
Travis Howell
2ffaf0ee1a Fix assert when playing Safari Snapshot in Blue's ABC Time Activities, caused by code difference in earlier HE games.
svn-id: r35558
2008-12-26 12:27:55 +00:00
Travis Howell
3bbbcc3849 Fix crash after selecting name in Blue's ABC Time Activities, caused by an invalid write in wizPackType1().
svn-id: r35551
2008-12-26 06:18:39 +00:00
Eugene Sandulenko
829cbc4110 Move all video players to separate directory
svn-id: r35470
2008-12-21 21:08:17 +00:00
Filippos Karapetis
10e471bb5b - Added some disabled code for Smacker audio support (still incomplete, not working yet)
- Made the _image buffer protected instead of private (in case it's coped directly to the screen and not an intermediate buffer)

svn-id: r35411
2008-12-17 14:48:57 +00:00
Filippos Karapetis
0b1d31383b - Added some comments
- Removed _paletteDidChange, as the virtual setPalette() function is called back on every palette change
- Some cleanup
- Removed unused/unneeded functions and variables
- Changed _frameTypes to hold bytes instead of 32-bit integers (since frame types are held within a byte)

svn-id: r35391
2008-12-16 09:56:21 +00:00
Travis Howell
ddb810e17b Add Moonbase Commander target again, for testing only.
svn-id: r35379
2008-12-15 09:54:21 +00:00
Travis Howell
9c20a533bb Enable Smacker support, and switch later HE games to Smacker support (since they aren't supported yet).
svn-id: r35368
2008-12-14 23:41:48 +00:00
Travis Howell
df9a1baadc Fix regressions in HE games, when slashes are used in filenames for file opcodes.
svn-id: r35105
2008-11-17 11:09:57 +00:00
Johannes Schickel
2ef8a32a01 Fixed various g++ warnings ("format not a string literal and no format arguments").
svn-id: r35096
2008-11-16 20:20:31 +00:00
Max Horn
40136f2590 Switched various Engine APIs to use Common::Error
svn-id: r34916
2008-11-06 17:05:54 +00:00
Max Horn
d387206175 Pushed down some header deps
svn-id: r34845
2008-10-23 07:59:10 +00:00
Max Horn
61b04725a1 Another tweak to HE: Use SearchMan.openFile instead of a raw FSNode
svn-id: r34804
2008-10-14 19:39:33 +00:00
Max Horn
4686615edf Fix for bug #2162342: FREDDI1: Game does not start
svn-id: r34793
2008-10-13 10:26:26 +00:00
Max Horn
c7fde102e3 Renamed FilesystemNode -> FSNode
svn-id: r34716
2008-10-02 16:58:59 +00:00
Max Horn
9b160804ab Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
2008-09-30 12:27:38 +00:00
Max Horn
96faab4271 SCUMM HE: Use FilesystemNode::openForReading() instead of 'new Common::File' (didn't cover all instances, though)
svn-id: r34694
2008-09-30 09:09:39 +00:00
Max Horn
392f9ee7fa SCUMM HE: Fixed leak in Win32ResExtractor::extractResource_, use _filename instead of File::name
svn-id: r34683
2008-09-29 11:02:11 +00:00
Max Horn
c1385076cb cleanup
svn-id: r34649
2008-09-25 10:14:50 +00:00
Max Horn
1537e162f6 SCUMM: Moved more stuf from class Actor to ActorHE
svn-id: r34648
2008-09-25 10:11:06 +00:00
Max Horn
c41480bfd4 SCUMM: Moved Actor::drawActorToBackBuf to class ActorHE
svn-id: r34647
2008-09-25 08:19:51 +00:00
Travis Howell
52ec841cd4 Add debugInput opcode for HE 100 games.
svn-id: r34375
2008-09-06 01:02:45 +00:00
Travis Howell
4bb1decf79 Use exact case numbers, to avoid unneeded subtractions.
svn-id: r34352
2008-09-05 13:35:27 +00:00
Travis Howell
fa5f22944d Add missing case in o100_resourceRoutines.
svn-id: r34328
2008-09-04 14:12:27 +00:00
Christopher Page
4198ee9623 Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
 

svn-id: r33624
2008-08-04 22:34:07 +00:00
Max Horn
0be985ce83 Changed class File (and derived classes) to only support read-only access; added a new class DumpFile for writing
svn-id: r33412
2008-07-29 16:09:10 +00:00
Christopher Page
d2e8d4831e Merged revisions 32744-32745,32747,32750-32759,32762-32764,32769,32777,32783,32785-32786,32789-32791,32798-32799,32801-32807,32809-32812,32816-32817,32819-32821,32823-32830,32832-32836,32838-32844,32846-32850,32852-32854,32858-32859,32865-32868,32873-32874,32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33051
2008-07-14 00:10:09 +00:00
Christopher Page
e9c6b03fc7 SCUMM works with new GMM implementation
svn-id: r33001
2008-07-11 01:22:37 +00:00
Bertrand Augereau
f41ab55021 Fixed a few warnings
svn-id: r32994
2008-07-10 18:01:54 +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
Travis Howell
84ec2374ab Update a few debug messages.
svn-id: r31556
2008-04-17 23:57:31 +00:00
Travis Howell
3db5db1127 Enable original load/save system in HE100 games.
svn-id: r31529
2008-04-17 07:01:15 +00:00
Travis Howell
353e5a7896 Add hack to skip the faulty credits script in Russian HE99 version of Freddi Fish 3.
svn-id: r31080
2008-03-09 09:28:10 +00:00
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
Eugene Sandulenko
fa5271d836 Really fix bug #1846886: "PUTTZOO: Windows version cursor/pointer drawn wrong".
Also replace default HE cursor (used in Lost) with correct one.

svn-id: r30650
2008-01-27 15:10:56 +00:00
Max Horn
3e980392d5 Fixed bug #1861582 (COMI: Banjo duel seems harder than in the original) by changing the way SCUMM updates the timer vars (matches disasm now). Beware of regressions\!
svn-id: r30418
2008-01-11 22:12:06 +00:00
Travis Howell
f31b835fda Resort a few cases and opcodes in HE code.
svn-id: r30289
2008-01-06 06:21:04 +00:00
Travis Howell
6c6a2a57b5 Fix endian issue in checkArrayLimits().
svn-id: r30178
2008-01-03 03:34:25 +00:00
Travis Howell
639929a09e Fix endian issue in redimArray.
svn-id: r30176
2008-01-03 03:20:32 +00:00
Eugene Sandulenko
a4cbfa354b Fix bug #1846886: "PUTTZOO: Windows version cursor/pointer drawn wrong"
svn-id: r30154
2008-01-02 17:33:57 +00:00
Travis Howell
8f540e9b67 Move more HE code to HE71, to reduce code size, when using DISABLE_HE option.
svn-id: r30023
2007-12-28 00:18:06 +00:00
Travis Howell
9b0db4be37 Move more HE code to HE71, to reduce code size, when using DISABLE_HE option.
svn-id: r30021
2007-12-28 00:08:23 +00:00
Travis Howell
410a4a974e Enable Windows version of early HE games by default, to match already enabled 3DO/DOS/Macintosh versions of early HE games. Adding only the minimum code required for HE70 games.
svn-id: r30011
2007-12-27 11:40:29 +00:00
Eugene Sandulenko
7844ad6f2c An attempt to implement thick line drawing.
svn-id: r29639
2007-11-25 13:33:28 +00:00
Eugene Sandulenko
8d228219c9 Switch to our common drawLine routine
svn-id: r29635
2007-11-25 10:27:50 +00:00
Travis Howell
1266b7eb15 Fix regression in Fun Shop titles, when starting activites.
svn-id: r29634
2007-11-25 10:04:23 +00:00
Travis Howell
28e0985061 Add stub for wizImages thickLine code.
svn-id: r29632
2007-11-25 03:17:48 +00:00
Travis Howell
f47add1b7e Add notes (From wiki) for u32 codes used in Backyard Soccer.
svn-id: r29631
2007-11-24 23:58:09 +00:00
Eugene Sandulenko
e10aa928c1 Implement soccer opcode 1006. Nothing is tested and is pure processing
of bb86 utility.

svn-id: r29630
2007-11-24 21:56:36 +00:00
Gregory Montoir
c38ccb18c7 don't pass a pointer in a middle of a resource buffer with mixer AUTOFREE flag set (untested but probably fixes #1754525)
svn-id: r29618
2007-11-23 18:19:32 +00:00
Eugene Sandulenko
2f6343c9cd Implement soccer logic opcode 1003
svn-id: r29616
2007-11-22 22:32:58 +00:00
Eugene Sandulenko
f4946e6400 Fix bug with rotating shapes in funshop games
svn-id: r29614
2007-11-22 21:24:50 +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
Travis Howell
443dff5285 Add support for original load/save system in HE games.
svn-id: r29434
2007-11-06 12:22:52 +00:00
Max Horn
3f958711a2 Refactored ScummEngine*::checkExecVerbs method
svn-id: r29284
2007-10-28 12:57:25 +00:00
Travis Howell
22c009ee45 Fix regression, when loading levels in mustard.
svn-id: r28997
2007-09-21 01:20:22 +00:00
Matthew Hoops
f3175861ba implement o72_debugInput (with some help from Kirben)
svn-id: r28988
2007-09-20 20:50:38 +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
0cccbb29d6 Some cleanup (yay for whomever had the brilliant idea to let SVN work over HTTPS and hence through proxies&firewalls :)
svn-id: r28877
2007-09-08 11:15:27 +00:00
Max Horn
e1bcd70436 Re-added __attribute__(packed)
svn-id: r27830
2007-07-01 18:18:43 +00:00
Travis Howell
12c9fb0382 Add support for pausing/resume cutscenes shown on the OmniTV in The Feeble Files.
svn-id: r27371
2007-06-12 06:08:47 +00:00
Travis Howell
c8259673b7 Fix possible crash issue, if music volume was set by 3DO versions of HE games.
svn-id: r27125
2007-06-06 03:38:45 +00:00
Travis Howell
e29263611a Fix bug #1727457 - WATER: Unexpected crash at the end of level 15.
svn-id: r27036
2007-06-01 08:47:22 +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
Max Horn
00b9bc7b36 Removing lots of superfluous semicola (see mail by David Weinehall on scummvm-devel)
svn-id: r26594
2007-04-25 19:31:23 +00:00
Kostas Nakos
4bf26957aa silence a compiler symbol redefinition warning
svn-id: r26441
2007-04-09 18:55:45 +00:00
Travis Howell
83841fda36 Adjust debug levels.
svn-id: r26421
2007-04-08 23:26:49 +00:00
Travis Howell
d58b2bea3b Adjust debug output in writeINI opcode, so it doesn't get skipped.
svn-id: r26420
2007-04-08 23:25:53 +00:00
Travis Howell
0673fa4aa5 Rename setFilePath opcode to createDirectory, in order to reflect the opcodes true purpose.
svn-id: r26418
2007-04-08 11:50:31 +00:00
Travis Howell
65472233f2 Set SaveGamePath INI setting to '*' in HE72+ games, to avoid warnings about no SaveGamePath path been set in Macintosh versions.
svn-id: r26417
2007-04-08 11:42:27 +00:00
Max Horn
2447752a51 Reverted my roomoffs changes (broke the Loom intro), and instead added the constant RES_INVALID_OFFSET to indicate an invalid room offset
svn-id: r26353
2007-04-01 15:58:34 +00:00
Max Horn
a08feb9f70 Got rid of some 0xFFFF -> 0xFFFFFFFF conversions and similiar nonsense by using a clever technique called 'signed ints' for room offsets (and this won't cause any regressions; any you may encounter are merely the products of a deranged imagination)
svn-id: r26331
2007-03-31 14:00:34 +00:00
Travis Howell
5057c1b5c8 Change getFileSize opcode, to check for files via SaveFileManager too. Fixes loading the high score table in the mini game of SPY Fox 2.
svn-id: r26279
2007-03-23 02:55:07 +00:00
Travis Howell
753c13111c Restore flipping code for raw wiz images, which was lost in revision 24860.
svn-id: r26120
2007-03-12 23:13:33 +00:00
Travis Howell
1e8047a5d2 Fix xmap regression, when drawing wiz images.
svn-id: r26119
2007-03-12 23:03:30 +00:00
Travis Howell
f1984bdeae Remove warning, logic code for soccer games is incomplete.
svn-id: r26100
2007-03-12 10:16:38 +00:00
Max Horn
e8e33e8077 Some more fraction data & an optimized formula (I still have no clue what that tries to compute, though :)
svn-id: r26043
2007-03-09 22:31:27 +00:00
Max Horn
3b09bc6c00 Updated fraction values
svn-id: r26042
2007-03-09 22:18:58 +00:00
Nicola Mettifogo
5d4b05a5ed added comments suggesting possible formulas for hardcoded float values
svn-id: r26041
2007-03-09 19:25:37 +00:00
Max Horn
7a10fa7283 Some more LogicHE cleanup
svn-id: r26038
2007-03-09 01:11:55 +00:00
Max Horn
6f56443e56 Some more LogicHE cleanup
svn-id: r26037
2007-03-09 00:48:45 +00:00
Max Horn
37af88c8c4 Some cleanup, and added some of my observation (man this code is really strange)
svn-id: r26036
2007-03-09 00:34:28 +00:00
Max Horn
6b348c03d5 Revised LogicHErace::op_1140 (the two multiplications by constants still baffle me, but at least it makes some sense now, and corrects the worst bugs in that func)
svn-id: r26035
2007-03-09 00:29:38 +00:00
Nicola Mettifogo
1e985051a9 reduced dependency from windows-specific header files
svn-id: r26034
2007-03-09 00:13:07 +00:00
Max Horn
cfe86c096d cleanup
svn-id: r25927
2007-03-02 15:34:22 +00:00
Gregory Montoir
f68105912a fixed background music in catalog_cup_demo_de : only stop sfx if it was started in a previous block
svn-id: r25863
2007-02-25 19:15:00 +00:00
Torbjörn Andersson
a1a16d1579 Use consistent naming for the preprocessor constants used to guarantee that
header files are only included once. Many of them didn't have a SCUMM prefix
which could have lead to clashes with common header files.

svn-id: r25727
2007-02-19 17:48:19 +00:00
Torbjörn Andersson
16e7a12878 Some very obvious cleanups.
svn-id: r25635
2007-02-16 17:13:29 +00:00
Eugene Sandulenko
8405eca0ea Fix warnings
svn-id: r25554
2007-02-13 19:51:27 +00:00
Torbjörn Andersson
3bc0661065 Merged the "palette manager" into the cursor manager. It was only used to
manage *cursor* palettes, so the name was misleading.

svn-id: r25500
2007-02-12 00:04:56 +00:00
Max Horn
856742075e Code cleanup: Removing unused code for handling OS/2 (NE header) binaries
svn-id: r25497
2007-02-11 22:37:47 +00:00
Max Horn
534bfddd06 Fix for bug #1506591: HE71-73: Fails to load mouse data (Endian issue?)
svn-id: r25492
2007-02-11 18:07:19 +00:00
Max Horn
cb49cbdd45 * Reimplemented Mixer::pauseAll to simply invoke pause on all channels
(implying change of semantics)
* Reordered the params of Mixer::playRaw (the SoundType now comes first, not last)
* Removed Mixer::isPaused
* Removed Mixer::getSoundElapsedTimeOfSoundID
* Added some doxygen comments to the Mixer

svn-id: r25356
2007-02-03 19:05:53 +00:00
Max Horn
27432a4dc1 Moved some stuff from CharsetRenderer (back) to ScummEngine, added comments
svn-id: r25250
2007-01-28 20:11:31 +00:00
Gregory Montoir
51fd5c8c4b templatified some Wiz decoding functions
svn-id: r25209
2007-01-26 22:03:41 +00:00
Gregory Montoir
35b6cfcd9c fixed kSfxFlagRestart
svn-id: r25196
2007-01-25 23:17:05 +00:00
Gregory Montoir
519af02245 modified CUP player code to read data directly from a file stream instead of a large memory buffer.
svn-id: r25195
2007-01-25 21:42:18 +00:00
Gregory Montoir
d2f15566d3 added handler for sfx sync (abc-slideshow.cup, bda-slideshow.cup) and sfx looping, cleanup
svn-id: r25158
2007-01-21 22:08:02 +00:00
Travis Howell
c680f79eef Add cyx's patch for horizontal and vertical flipping of wiz images type 1, in HE games.
svn-id: r24860
2006-12-17 10:17:13 +00:00
Travis Howell
eb86007b31 Add code for stopping video playback in HE100 games
svn-id: r24858
2006-12-15 23:54:42 +00:00
Gregory Montoir
10a9989a58 added basic handlers for SFXB and SNDE tags in .CUP player
svn-id: r24857
2006-12-15 23:48:38 +00:00
Gregory Montoir
08c261a5a6 made CUP_Player only update the modified screen areas.
svn-id: r24831
2006-12-10 00:44:40 +00:00
Travis Howell
d1eb83a470 Add findBox opcode for Hebrew version of Freddi Fish 1
svn-id: r24780
2006-11-24 09:27:50 +00:00
Eugene Sandulenko
cfb29dcb51 Fix MSVC2005 warnings. Please, review the changes.
svn-id: r24760
2006-11-22 15:50:30 +00:00
Max Horn
c210aff40c * Made Actor::_pos protected, added public Actor::getPos() method
* Added default params to Actor::putActor()
* Removed Actor::getActorXYPos

svn-id: r24742
2006-11-19 00:39:48 +00:00
Gregory Montoir
e1efdfc7f6 simplified SRLE decoding, cleanup
svn-id: r24653
2006-11-07 22:22:23 +00:00
Gregory Montoir
6c8af67b60 added SRLE handler, cleanup
svn-id: r24643
2006-11-06 23:28:40 +00:00
Johannes Schickel
68c603631b cleanup
svn-id: r24642
2006-11-06 22:06:32 +00:00
Eugene Sandulenko
90e20121b8 Portability fix for some platforms.
svn-id: r24641
2006-11-06 18:21:07 +00:00
Eugene Sandulenko
8ef5e88323 Add support for HE CUP demos based on cyx's standalone player.
svn-id: r24636
2006-11-06 13:40:24 +00:00
Max Horn
db1fc75012 SCUMM cleanup
svn-id: r24612
2006-11-04 22:59:56 +00:00
Torbjörn Andersson
e57316c796 Fixed bad namespace comments spotted by clone2727.
svn-id: r24588
2006-11-03 06:16:11 +00:00
Travis Howell
6b425f03f4 Add video code for HE100 games
svn-id: r24586
2006-11-02 10:01:32 +00:00
Travis Howell
c3f6c57680 Enable Bink video playback in HE100 games
svn-id: r24584
2006-11-01 23:39:55 +00:00
Travis Howell
304c102613 Switch error to warning, since code is compatbile with football2002 too
svn-id: r24516
2006-10-25 23:48:47 +00:00
Max Horn
9edf1e6a1a cleanup
svn-id: r24407
2006-10-21 12:44:10 +00:00
Max Horn
5e9041b1b5 SCUMM: ArrayHeader related cleanup
svn-id: r24395
2006-10-20 19:44:27 +00:00
Max Horn
dd7e4ff3e7 SCUMM: walbox related cleanup
svn-id: r24365
2006-10-18 13:33:42 +00:00
Max Horn
a9b0a055c8 Moved get_resource_id_quoted around a bit and added another FIXME comment
svn-id: r24328
2006-10-15 02:00:37 +00:00
Max Horn
84874caf06 Got rid of ScummEngine::_confirmExit, and some other minor cleanup
svn-id: r24319
2006-10-15 00:50:22 +00:00
Max Horn
ff6731e00a Removed 'smushMode' param from processInput and processKeyboard in favor of a new member _smushActive of ScummEngine_v7
svn-id: r24175
2006-10-07 17:42:32 +00:00
Max Horn
f13e4baaf9 Renemaed ScummEngine::processKbd to processInput (as it also deals with the mouse)
svn-id: r24164
2006-10-07 12:19:28 +00:00
Max Horn
ef30cdf78b some HE related cleanup
svn-id: r24163
2006-10-07 11:54:50 +00:00
Max Horn
285aa5d0b2 renamed ScummEngine::restoreBG to restoreBackground; renamed and moved Gdi::copyVirtScreenBuffers to ScummEngine_v70he::restoreBackgroundHE
svn-id: r23925
2006-09-17 23:35:09 +00:00
Max Horn
fab33bf663 Moved stored flobjects to class ScummEngine_v70he
svn-id: r23924
2006-09-17 22:22:50 +00:00
Max Horn
51017cf1b2 Renamed ScummEngine::res to _res and allocate the ResourceManager on the heap (i.e. _res is a pointer now)
svn-id: r23922
2006-09-17 20:36:48 +00:00
Max Horn
8c0b0c0120 Changed ScummEngine::gdi to _gdi and allocate the Gdi object on the heap (i.e. _gdi is a pointer now)
svn-id: r23921
2006-09-17 20:22:47 +00:00
Max Horn
b860f002b2 Replaced checkRange by assertRange, which has (a) an (IMO) more logical order of parameters, and (b) removes lots of useless duplicate information in error messages
svn-id: r23885
2006-09-16 13:38:43 +00:00
Max Horn
bd38f5f4d3 Renamed o6_getActorAnimCounter1 to o6_getActorAnimCounter
svn-id: r23857
2006-09-09 18:31:32 +00:00
Travis Howell
7ca75815aa Add HE72+ specific version of convertMessageToString(), to reduce filtering and since special codes aren't used.
svn-id: r23814
2006-09-01 12:04:40 +00:00
Torbjörn Andersson
c32076e5d0 Use #include "..." instead of #include <...> for pack-start.h and pack-end.h
for consistency with other #includes.

svn-id: r23585
2006-07-23 16:13:26 +00:00
Max Horn
2859b64702 Fix struct packing issues (macros are not resolve in #pragma params, at least for GCC)
svn-id: r23569
2006-07-22 17:28:48 +00:00
Max Horn
f59cf1fcdc Removing GCC_PACK, we fully rely on START_PACK_STRUCTS / END_PACK_STRUCTS now (hiya eriktorbjorn, this one is for you *ggg*)
svn-id: r23547
2006-07-21 21:25:17 +00:00
Torbjörn Andersson
6358547a43 More whitespace changes.
svn-id: r23496
2006-07-14 13:33:58 +00:00
Travis Howell
76e67fba92 Fix actor glitches in the stomach location of pajama3
svn-id: r23471
2006-07-10 10:14:10 +00:00
Max Horn
f35f4a4d1c Use START_PACK_STRUCTS / END_PACK_STRUCTS when available, instead of checking for GCC / not GCC
svn-id: r23458
2006-07-09 13:01:15 +00:00
Travis Howell
b3f2d299fe HE80+ games ignore subtitle speed, due to sound code been used. Fixes glitches that can occur, when slow subtitle speed is set in HE80+ games.
svn-id: r23447
2006-07-09 05:47:17 +00:00
Travis Howell
6ed462e06f Rename VAR_WINDOWS_VERSION to VAR_PLATFORM_VERSION
svn-id: r23419
2006-07-08 10:28:35 +00:00
Travis Howell
9269ebe9f5 Fix off by one, in the stomach of pajama3
svn-id: r23377
2006-07-06 12:22:33 +00:00
Travis Howell
e17fe8e88b Remove left over ;
svn-id: r23335
2006-06-28 14:14:21 +00:00
Travis Howell
dd57c57982 Add eriktorbjorn's patch for DXA unification, with more changes
svn-id: r23332
2006-06-28 14:06:54 +00:00
Max Horn
72a4747dd6 Fix warning
svn-id: r23273
2006-06-24 07:14:15 +00:00
Travis Howell
dbfc1cb9b1 Convert file path, before playing videos in HE games
svn-id: r23263
2006-06-23 23:10:23 +00:00
Travis Howell
4b2aa54304 Revert back to original method used for scrollEffect(), fixes regressions.
svn-id: r23214
2006-06-21 06:50:50 +00:00
Travis Howell
bc6306192d Fix screen scrolling glitch when looking at the top of closet in parents room of DOS version of fbear
svn-id: r23174
2006-06-19 04:09:39 +00:00
Travis Howell
31e7efc167 Remove debug left over
svn-id: r23172
2006-06-18 10:54:54 +00:00
Travis Howell
49b3f8f539 Add alternative method to prevent debug code of scripts been triggered in lost. Fixes regressions when convertFilePath() is used by some HE games
svn-id: r23171
2006-06-18 10:46:22 +00:00
Travis Howell
40bfc71de8 Fix rects in HE games, when positions are set by scripts
svn-id: r23146
2006-06-16 13:14:55 +00:00
Torbjörn Andersson
94de874087 Since setCursorHotspot() does not update the cursor (should it?), we have to
call it before setCursorFromBuffer(), not afterwards. This fixes the cursor
hotspot being temporarily wrong in HE games that use loadWizCursor().

svn-id: r23094
2006-06-13 18:37:40 +00:00
Torbjörn Andersson
df4f95f805 Let the [cursor] palette manager handle disableCursorPalette() too, to avoid
cursor glitch in at least some HE games which first set a cursor palette, and
then disable it. (The disabled palette would be re-enabled after dismissing the
GUI.)

svn-id: r23081
2006-06-13 09:48:46 +00:00
Travis Howell
afe07d82c0 Use convertFilePath for HE6x games too, for safety
svn-id: r22994
2006-06-09 09:01:06 +00:00
Travis Howell
f571c471cc Add DOS and Macintosh versions of Putt-Putt & Fatty Bear's Activity Pack
svn-id: r22991
2006-06-09 08:06:38 +00:00
Travis Howell
04d8cef848 Minor cleanup
svn-id: r22950
2006-06-06 04:33:09 +00:00
Torbjörn Andersson
2f51f40c11 Downgraded startHETalkSound() error (when the speech file isn't open) to a
warning, since it happens on the Pajama Sam's Lost & Found demo's main menu
screen.

svn-id: r22593
2006-05-24 03:56:48 +00:00
Max Horn
e4ab8000f0 Pass values by-reference, using C++ references, and not by using pointers
svn-id: r22548
2006-05-20 15:09:15 +00:00
Torbjörn Andersson
05814a1458 Apparently, passing a file handle directly to a function causes that file
handle (a copy of the original?) to be destroyed at the end of the function,
and that closes the internal file handle, even though we want it to stay open.

Who am I to argue with how C++ handles its parameters? I've simply changed the
functions to take pointers to file handles instead. Seems to fix crashes in the
Macintosh resource extractor for me.

svn-id: r22546
2006-05-20 13:59:31 +00:00
Torbjörn Andersson
6cdd98b617 After the GUI has finished, restore the old cursor palette (if any). For this
to work, cursor palette now has to be set using the new "palette manager". See
graphics/paletteman.cpp

svn-id: r22543
2006-05-20 10:59:25 +00:00
Travis Howell
4c67122463 Avoid closing a video file in HE games twice
svn-id: r22396
2006-05-08 22:53:09 +00:00
Travis Howell
3f9395831c Fix regression in lost, the middle directories were removed
svn-id: r22388
2006-05-08 13:10:49 +00:00
Travis Howell
ca513f7e66 Fix off by one in rect when capturing image
svn-id: r22387
2006-05-08 11:41:32 +00:00
Travis Howell
3830ac06b3 Add initial DXA support for HE games
svn-id: r22384
2006-05-08 10:21:17 +00:00
Travis Howell
01c92cf6f5 Add support for reading/writing config files through saveGameManager and use for config files in HE games
svn-id: r22273
2006-05-02 03:23:03 +00:00
Max Horn
77c29d0ab2 Some cleanup, and added a FIXME comment concerning the wrong usage of getSavePath()
svn-id: r22266
2006-05-01 21:31:06 +00:00
Max Horn
27307acd7c Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
2006-04-29 22:33:31 +00:00
Max Horn
c4df5037dc * Renamed several methods in favor of a somewhat more uniform naming scheme: setupFOO for stuff that inits static data (i.e. will be called only once, or after loading savegames), vs. resetFOO / updateFOO methods which are called frequently and (re)set dynamic data.
* Doing this, split scummInit into setupScumm and resetScumm methods
* Moved some init code to new methods (huuuuge init methods are hard to read, and hard to customize using subclassing)
* Renmaed various setup???Palette methods to set???Palette
* Some minor cleanup / tweaks

svn-id: r22227
2006-04-29 16:24:39 +00:00
Max Horn
1735b0421b Make use of the new scummLoop_* functions to move some SCUMM version specific stuff around
svn-id: r22219
2006-04-29 13:01:35 +00:00
Max Horn
092fd96145 Replaced _hFileTable by _hInFileTable/_hOutFileTable
svn-id: r22182
2006-04-26 14:05:09 +00:00
Travis Howell
5ceb4b19b0 isSoundRunning always returns sound id in HE games
svn-id: r22176
2006-04-26 10:34:34 +00:00
Max Horn
c940380314 Replace unneeded File::exists calls
svn-id: r22173
2006-04-26 08:35:54 +00:00
Max Horn
e80d24aa22 Some more cleanup in class Scumm::Sound
svn-id: r22125
2006-04-23 23:00:32 +00:00
Max Horn
3f41e2dc21 Detect (and error out) if readMAXS fails
svn-id: r22120
2006-04-23 22:39:55 +00:00
Max Horn
e0a5a2b89e Fix access to .he3/.he4 files
svn-id: r22118
2006-04-23 21:56:09 +00:00
Max Horn
b2befd7951 Moved _heTimers to ScummEngine_v60he
svn-id: r22116
2006-04-23 19:41:54 +00:00
Max Horn
d68f95b3be Move HE specific stuff from class Sound to its new subclass SoundHE
svn-id: r22115
2006-04-23 18:52:39 +00:00
Max Horn
0d67640a58 Behold, the new SCUMM detector finally has arrived. Unified detection & engine instantiation, reduced code duplication, more powerful detection in case MD5 is not known / can't be computed, and many other nifty improvements.
svn-id: r22110
2006-04-23 17:33:16 +00:00
Eugene Sandulenko
ff6028b00b - Implemented MS ADPCM WAV format decoder used in Feeble Files. Still it is
out of sync with video. See TODO there.
- Fixed bug with MS IMA ADPCM mono to make it possible to work in real streams.

svn-id: r22080
2006-04-22 03:00:21 +00:00
Max Horn
ac24769196 Replaced o70_seekFilePos by o60_seekFilePos (both were identical)
svn-id: r21979
2006-04-17 14:32:46 +00:00
Max Horn
74edd90aba Fix for bug #1471383: Instead of overloading ConfigManager::set, we now have new setInt and setBool methods (matching getInt/getBool), which avoids strange quirks & bugs caused by (char *) being implicitly cast to int (ouch)
svn-id: r21951
2006-04-16 19:23:14 +00:00
Max Horn
68cb7f52c8 - Renamed ConfigManager::getActiveDomain to getActiveDomainName, and added a new getActiveDomain method that returns a pointer to the actual active *domain*
- Added Engine::_targetName whose value is computed from the name of the active domain
- Removed GameDetector::_targetName, instead code now uses either Engine::_targetName or the name of the active domain
- This in turn allowed for removing usage of GameDetector in many places

svn-id: r21916
2006-04-15 20:36:41 +00:00
Max Horn
cf202049ff Fixing mismatch between format strings and data on some systems
svn-id: r21827
2006-04-12 14:54:12 +00:00
Jonathan Gray
eb3ae7d726 sizeof(void *) != sizeof(int) for a large number of systems.
Fix a lot of debug/error statements that were using %d/%x
for the result of pointer arithmetic.

As C++ apparently has no format string for ptrdiff_t use
%lu/%lx as appropriate.

svn-id: r21824
2006-04-12 10:01:41 +00:00
Eugene Sandulenko
a74fcf7cee Fix regression introduced by removing of GF_HE_CURSORLESS feature flag.
There are 3 cases of HE cursors:
o Default one. We set up cursor palette for it.
o Loaded from .HE3 (windows resource file). We use default cursor palette.
o Loaded from WizImage. We disable default cursor palette.

svn-id: r21711
2006-04-09 03:16:05 +00:00
Max Horn
9c77c2ecd1 Renamed various *GameSettings to GameSettings (our namespaces are enough to distinguish them)
svn-id: r21684
2006-04-08 08:23:33 +00:00
Travis Howell
0e9b4ab17c GF_HE_CURSORLESS feature flag not required, since HE games always set a default cursor too.
svn-id: r21576
2006-04-03 11:35:02 +00:00
Travis Howell
d10929b394 Always check array bounds are valid in HE games, matching original
svn-id: r21524
2006-04-01 12:26:50 +00:00
Travis Howell
7a81cc76e1 Fix painting and fridge magnet palette glitches in thinker1
svn-id: r21522
2006-04-01 06:38:47 +00:00
Travis Howell
c4349e88f7 Rename two WizParameters fields
svn-id: r21514
2006-03-31 13:06:23 +00:00
Travis Howell
014dde3de3 Add missing check for invalid object number in getObjectData opcode
svn-id: r21501
2006-03-30 00:32:29 +00:00
Travis Howell
26c0d2b4fa Always use the correct string slot for HE games specific cases in decodeParseString()
svn-id: r21462
2006-03-26 09:21:07 +00:00
Travis Howell
ef6baca2ac Move convertFilePath() to ScummEngine_v60he, to allow use by earlier HE games
svn-id: r21450
2006-03-25 11:01:00 +00:00
Travis Howell
03202876cf Minor cleanup
svn-id: r21446
2006-03-25 04:33:33 +00:00
Eugene Sandulenko
22042bc637 - Implemented case insensitive file reading. Left old system as a fallback
in case some engine writer decide to do something unwise
- Removed used of ConfMan.getKey("path") in file-related cases, because
  now File class handles that
- Fixed bug in ScummEngine_v80he::o80_getFileSize() where path delimiters
  weren't translated

svn-id: r21443
2006-03-25 04:17:17 +00:00
Travis Howell
8ae4dd6caa Revert FLAG_AUTOFREE changes to loadWAVFromStreammakeWAVStream
svn-id: r21375
2006-03-19 05:15:06 +00:00
Travis Howell
a441dafae5 Move the sound loop detection, so it is used by all HE70+ games
svn-id: r21374
2006-03-19 04:55:34 +00:00
Travis Howell
1b20b06822 Skip HSHD block by set size, since there are sound resources (ie Caiman in jungle) which have incorrect size in HSHD header
svn-id: r21373
2006-03-19 04:41:43 +00:00
Travis Howell
c6082389a2 Confirmed it is safe to remove workaround for Macintosh HE99 version of water.
svn-id: r21253
2006-03-13 10:00:10 +00:00
Travis Howell
230a68755e Unfortunately the workaround for Macintosh version of water is still required.
svn-id: r21231
2006-03-12 10:56:14 +00:00
Travis Howell
66730f3b6b Use script support for Macintosh versions of HE80+ games
svn-id: r21227
2006-03-12 09:27:56 +00:00
Travis Howell
8602fe7432 Revert mistaken commit of local debug code
svn-id: r21222
2006-03-12 04:19:03 +00:00
Travis Howell
3e72b26adc Revert mistaken commit of local debug code
svn-id: r21220
2006-03-12 01:06:23 +00:00
Travis Howell
f9797f3ac3 Correct mistake in md5 tables for Simon the Sorcerer 2 (DOS Floppy)
svn-id: r21219
2006-03-12 00:53:30 +00:00
Travis Howell
beb0c9e297 Fix endian issue in getArrayDim()
svn-id: r21216
2006-03-11 09:43:00 +00:00
Travis Howell
f52e1709bf o6_setObjectName is never used by HE72+ games
svn-id: r21211
2006-03-10 23:09:27 +00:00
Max Horn
d9a9fac937 Fixed tons of format string warnings for debug/error calls (including several errors where the format string didn't match the number of arguments to the call)
svn-id: r21141
2006-03-08 11:37:25 +00:00
Travis Howell
431c820e4f Correct order of cases in o72_redimArray()
svn-id: r21135
2006-03-07 22:27:14 +00:00
Max Horn
bb38ea2c17 Renamed SubstResFileNames::winName and macName to almostGameID / expandedName (the old names were misleading; the new ones aren't great either :)
svn-id: r21062
2006-03-04 10:38:05 +00:00
Max Horn
140f6fce26 Hiding the implementation of ADPCMInputStream from the public, in favor of a factory function (just like with the other AudioStream subclasses)
svn-id: r21043
2006-03-03 15:51:33 +00:00
Max Horn
bac32d1a5c Moved ScummFile etc. to the new file.cpp / file.h
svn-id: r21038
2006-03-03 15:16:02 +00:00
Travis Howell
0b30043f93 Read array bounds in checkArrayLimits() correctly on all systems
svn-id: r21024
2006-03-03 07:40:34 +00:00
Travis Howell
ab0cf121c9 Always use music sound type, for music in 3DO versions of HE games
svn-id: r21019
2006-03-03 00:45:27 +00:00
Travis Howell
7423394bdd Use sound types for sound in HE Games
svn-id: r21018
2006-03-02 23:31:28 +00:00
Lars Persson
f00809788b Changed cast from int to int32, to use platform specified typedefs for the type.
svn-id: r21010
2006-03-02 12:09:19 +00:00
Travis Howell
8f76068148 Fix compile
svn-id: r20997
2006-03-01 22:36:53 +00:00
Lars Persson
0653d509d3 Updated datatypes to resolve ambiguity
svn-id: r20991
2006-03-01 14:20:40 +00:00
Travis Howell
deecb61656 Use _numStrips when checking for foreced sprite redraw, instead of set values.
svn-id: r20956
2006-02-27 12:23:34 +00:00
Travis Howell
bd2a59787b That change shouldn't have been commited
svn-id: r20903
2006-02-26 02:23:59 +00:00
Travis Howell
76962c3ce6 Change debugInput opcode result to zerod array for now, since it expects input string
svn-id: r20901
2006-02-26 00:32:10 +00:00
Max Horn
2ae0f79de3 Split SCUMM's generateSubstResFileName into two functions: findSubstResFileName and applySubstResFileName
svn-id: r20879
2006-02-25 17:36:32 +00:00
Travis Howell
7b9baa4f9f Cleanup decompress wizImage functions, to help find similar code
svn-id: r20874
2006-02-25 11:48:35 +00:00
Max Horn
6914121f61 Replaced MKID by MID_BE in most places in the SCUMM engine
svn-id: r20862
2006-02-25 02:12:58 +00:00
Travis Howell
a0b7c01762 Adjust masking in copyWizImageWithMask() to match ScummVM, wizImages masking works fine now
svn-id: r20858
2006-02-25 01:02:07 +00:00