Commit Graph

101 Commits

Author SHA1 Message Date
Matthew Hoops
eea482fa43 ALL: behaviour -> behavior 2011-05-25 10:50:46 -04:00
Max Horn
649f8e0a84 SCUMM: Rename ResTypes->ResType, introduce ResId typedef, change code to use both 2011-05-13 14:02:53 +02:00
Max Horn
b37463fe59 SCUMM: Move class ResourceManager to its own header 2011-05-13 11:47:08 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Max Horn
0725be325f SCUMM: Extend workaround for bug #1668393 (see bug #3267665) 2011-04-04 13:04:17 +02:00
Florian Kagerer
56f98a8574 SCUMM/FM-TOWNS: hopefully fix bug #1463434
o5_verbOps() case 9 (SO_VERB_NEW) works slightly different in SCUMM 3 FM-TOWNS (I don't know about DOS).
This should fix the issue with the broken key shortcuts.
Old savegames won't be fixed, though (since the broken verb states will be restored from the save file).

svn-id: r54872
2010-12-11 23:51:50 +00:00
Max Horn
cda2c950d6 SCUMM: Simplify SO_LOAD_STRING code
svn-id: r53574
2010-10-18 18:56:40 +00:00
Max Horn
32f1a9ad8b SCUMM: Add paranoia check
svn-id: r53573
2010-10-18 18:56:20 +00:00
Max Horn
3b21db1618 SCUMM: Fix parts of bug #3087898 (SCUMM: Code analysis warnings)
svn-id: r53567
2010-10-18 16:00:07 +00:00
Florian Kagerer
8e6ce812d1 LOOM PC-Engine: fix regression
svn-id: r53113
2010-10-10 10:26:49 +00:00
Florian Kagerer
5af782c5d2 SCUMM/FM-TOWNS: disable new graphics code in DS port
svn-id: r53033
2010-10-05 19:04:52 +00:00
Florian Kagerer
0d8f4a22ae SCUMM/FM-TOWNS: fix palette and other graphics issues
This commit should fix at least the following bugs/feature requests: #1032859, #1252088, #1055391, #1315968, #1315938, #1742106, #812891.
The FM-Towns version of Scumm games use a mixed graphics mode with 2 layers (one with 32767 colors and one with 16 colors). Among other things I have added a screen output class which emulates this  dual layer approach which allows specific hardware effects like enabling and disabling layers (e.g. in the voodoo priestess scene in MI1).

Old savegames (saved before this update) will load, but you’ll encounter palette glitches in the verb/inventory screen, since the 16 color palette for layer 2 is not contained in your savegame. This will be true at least for version 5 games. Certain scene change actions (which require the verb/inventory part to be redrawn) might correct this (e.g. try looking at the treasure map in MI1 and closing it). Version 3 games should be okay, since they use a static text palette which is never changed and which will be reset after loading a savegame.

This update requires a USE_RGB_COLORS setting for proper operation. 8 bit users will get a warning that they’ll have to expect palette glitches . Apart from that the engine in 8 bit mode should not only still work okay, but also benefit from some of the other (non palette related) improvements (e.g. bug #1032859 should be fixed even in 8 bit mode).

Japanese font drawing hasn’t been improved much yet. This will be a separate task.

svn-id: r52966
2010-10-01 19:24:52 +00:00
Florian Kagerer
b55a70acb8 KYRA/TOWNS: fix memory leak and some cleanup
svn-id: r52232
2010-08-20 17:04:32 +00:00
Florian Kagerer
29a5c6a45b SCUMM/FM-TOWNS: start rewriting audio code
- Start rewriting audio code for FM-TOWNS versions of Loom, Indy3 and Monkey Island 1 using the recently added code in towns_audio.cpp (Zak should work the same way, but I can't test, since I don't own that one).
- All sound types (pcm, euphony and cd audio) now support volume and balance control (e.g. try walking into/out of the kitchen and opening/closing the door in the Scumm Bar in Monkey Island 1 or walking into/out of the circus tent).
- Pcm sounds now support proper loop start/end and note offsets (e.g. try out the hammer sound in the forge in LOOM for example).
- some other minor improvements
- The FM-Towns versions of Indy 4 and Monkey Island 2 are not affected. I don't have Monkey Island 2, but I presume that it will work like Indy 4. Adding support for these will be a separate task, since they work quite differently.

svn-id: r52198
2010-08-18 21:38:43 +00:00
Max Horn
8a5705132d SCUMM: More finely differentiate opcode tables between v3, v4 and v5
This has been tested and verified as much as I can, but has a small
risk of leading to (easily fixable) regressions.

svn-id: r52130
2010-08-16 19:58:01 +00:00
Max Horn
5602b2cf81 SCUMM: Move setResult/getResultPos to script_v5.cpp
svn-id: r52129
2010-08-16 19:57:35 +00:00
Max Horn
444a6b5976 Workaround bug #3003643 (MI1EGA German: Credit text incorrect)
svn-id: r49895
2010-06-15 23:12:34 +00:00
Max Horn
4e7dddadbc SCUMM: Add WORKAROUND comment
svn-id: r48284
2010-03-18 15:10:07 +00:00
Travis Howell
a7e6397fa4 Add patch #2971126 - MM V0: Ed(na) walk fix.
svn-id: r48268
2010-03-16 08:43:46 +00:00
Max Horn
abbf2bf162 Fix bug 2908376: FOA: Won't launch in Win32
svn-id: r46250
2009-12-04 14:25:31 +00:00
Travis Howell
122ff32d75 Remove excess spaces.
svn-id: r44029
2009-09-11 10:13:54 +00:00
Gregory Montoir
d362ca86f6 add "-IQ" suffix test to SO_LOAD_STRING (same as SO_SAVE_STRING) ; fixes french version of atlantis
svn-id: r42596
2009-07-18 21:26:44 +00:00
Travis Howell
1d40f78499 Add workaround for bug #1668393 - ZAK FM-TOWNS: Crash when entering Hostel from outside.
svn-id: r42590
2009-07-18 13:39:21 +00:00
Willem Jan Palenstijn
4ea74d7e04 Add one more type of IQ-points filename (for bug #2820803)
svn-id: r42436
2009-07-13 14:46:14 +00:00
Torbjörn Andersson
0999534749 The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
2009-05-31 10:02:16 +00:00
Max Horn
fb79b18571 Changed SaveFileManager methods to take Common::String params (instead of char pointers)
svn-id: r41000
2009-05-29 14:38:22 +00:00
Travis Howell
64fef497df Ooops, keep that comment.
svn-id: r40034
2009-04-21 04:48:50 +00:00
Travis Howell
acc86f5c62 Fix regression in SCUMM0, by calling ScummEngine::fetchScriptWord() directly. Since fetchScriptWordSigned(), still uses the overloaded fetchScriptWord() function.
svn-id: r40033
2009-04-21 04:42:45 +00:00
Max Horn
6a7bb77305 SCUMM: Introduced new method ScummEngine_v5::jumpRelative; unified some v0 and v2 opcodes
svn-id: r40025
2009-04-20 12:35:17 +00:00
Max Horn
3044593da0 SCUMM: Moved o5_saveLoadGame and o5_saveLoadVars to ScummEngine_v4 (the highest SCUMM version to implement these opcodes. Actually, our code was bugged in so far as we only ever invoked o5_saveLoadGame in V3 games, never in V4 games (but this properly never mattered ;)
svn-id: r40014
2009-04-19 01:01:54 +00:00
Max Horn
0e82403daa SCUMM: o5_ifNotState and o5_ifState are actually not part of v5, only in v3 & v4 -> renamed and moved them accordingly
svn-id: r40013
2009-04-19 01:01:28 +00:00
Max Horn
57c624b24d SCUMM: ScummEngine_v5::o5_oldRoomEffect -> ScummEngine_v4::o4_oldRoomEffect
svn-id: r40012
2009-04-19 01:01:09 +00:00
Max Horn
25d0e7d4bc SCUMM: In v5, only opcodes 0x05 and 0x85 are mapped to o5_drawObject; in v3 & v4, several other opcodes map to it. Capture this properly in the opcode tables
svn-id: r40011
2009-04-19 01:00:49 +00:00
Max Horn
31eeb37107 SCUMM: Moved ScummEngine_v2::o2_setBoxFlags to ScummEngine_v3::o3_setBoxFlags
svn-id: r40010
2009-04-19 01:00:31 +00:00
Max Horn
b32e9f00b0 SCUMM: MovedScummEngine_v5:: o5_pickupObjectOld to ScummEngine_v4::o4_pickupObject
svn-id: r40009
2009-04-19 01:00:11 +00:00
Max Horn
9655fa831e SCUMM: Turned PARAM_1,2,3 into an enum; minor tweaks
svn-id: r40008
2009-04-19 00:59:50 +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
Torbjörn Andersson
068e11fee9 Judging by bug #2727536 (and a forum post) we should recognize "IQ-" as a valid
prefix for the Fate of Atlantis IQ points file. (Either that, or make the
comparision case-insensitive.) So let's do that.

svn-id: r39904
2009-04-09 03:38:41 +00:00
Torbjörn Andersson
c111bb97f4 Fixed misleading error message.
svn-id: r39903
2009-04-08 16:48:12 +00:00
Max Horn
ee42d06a43 Patch from bug #2710315: INDY3/FOA: bug in patch for series IQ with ScummVM GUI
svn-id: r39677
2009-03-24 23:30:48 +00:00
Max Horn
6a4c475bb2 Patch #2676453: INDY3/FOA: series IQ with ScummVM GUI
svn-id: r39649
2009-03-23 22:34:53 +00:00
Matthew Hoops
8f9a655769 Check for a suffix of "-iq" when saving the iq points. Should fix bug #2701064.
svn-id: r39597
2009-03-21 19:38:33 +00:00
Max Horn
fe62c72e7a SCUMM: cleanup
svn-id: r39579
2009-03-20 23:02:40 +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
e44f07f988 SCUMM: Modified version of patch #1687041 (Scumm: Load-/Save-support for the original save-dialog)
svn-id: r39438
2009-03-16 04:45:12 +00:00
Max Horn
f233b89463 SCUMM: Modified version of patch #2674880 (FOA: unique filename for IQ-points file)
svn-id: r39436
2009-03-16 03:55:09 +00:00
Max Horn
ac59693be2 A ton of code formatting fixes; also fixed warnings about single line loops like 'while(cond);' by inserting newlines
svn-id: r36127
2009-01-29 05:26:12 +00:00
Max Horn
0ce8400841 Patch #2258906: SCUMM: fix builtin load game screen for v1-v5
svn-id: r35013
2008-11-12 10:16:06 +00:00
Max Horn
38a4eaa001 cleanup
svn-id: r34910
2008-11-06 14:03:38 +00:00
Christopher Page
909b66ef54 Merged revisions 33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33924
2008-08-16 04:30:01 +00:00