Commit Graph

113 Commits

Author SHA1 Message Date
Filippos Karapetis
4f807ee53e SCUMM: More renaming for players
Rename "player" directory to "players", and reintroduce the "player_"
file prefix. This has been done after sev's request.
"players/player_foo.*" is more descriptive, and avoids potential name
clashes in libraries
2013-11-01 19:26:51 +02:00
Filippos Karapetis
651bf89939 SCUMM: Move all players to a separate "player" directory
There are 34 player .cpp/.h player files, so they have been placed in
their own directory, to logically separate them from the rest of the
engine
2013-11-01 06:57:53 +02:00
Matthew Hoops
0031c41db8 COMMON: Change kPlatformPC to kPlatformDOS
"PC" was very ambiguous and now it matches what we show in the GUI.

This also corrects sword2's platform to Windows.
2013-05-02 18:43:10 -04:00
Torbjörn Andersson
ce79ff4f2e SCUMM: Change NUM_SCRIPT_LOCALS to NUM_SCRIPT_LOCAL
For consistency with NUM_SCRIPT_SLOT.
2013-05-01 07:47:56 +02:00
Torbjörn Andersson
2284aba719 SCUMM: Use correct array size when calling initializeLocals()
The initializeLocals() function assumes that it can copy 25
elements when being provided an array of values. But this array
was frequently a lot smaller than that. I've introduced a constant
for the number of locals (though VirtualMachineState has one more
for some reason), and fixed the array sizes in a number of places.

CID 1003951, 1003952, 1003953, 1003955, 1003956, 1003959, 1003960,
1003961, 1003963, 100394, 1003965
2013-04-30 22:26:51 +02:00
Johannes Schickel
89abab97e3 JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
2012-09-26 04:17:55 +02:00
Tobias Gunkel
96f8fc6ca9 SCUMM: Fix actor ID handling in v0
Some object functions allow actor IDs and object IDs as parameters. They are easily distinguishable in engines > 0 as actor IDs are < _numActors and object IDs are bigger. In v0 this is not the case as there are objects with IDs like 3 and 5 (e.g. the hamster). So object ID handling was unified for v0 and the other engines by introducing objIsActor(), objToActor() and ActorToObj().
2012-02-11 08:29:13 +01:00
Tobias Gunkel
621017ce65 SCUMM: remove some NOTEs/TODOs
- o5_breakHere() seems to be still needed. For example edna does not manage to walk up the ladder if this is not enabled.
- numLocalObjects seems to be big enough so that < instead of <= can be used. The original interpreter only uses the local ids 0 .. 44 whereas scummvm has _numLocalObjects set to 200.
2012-02-11 08:28:40 +01:00
Tobias Gunkel
de0b5f7674 SCUMM: use command stack and SentenceTab in mm c64
- MM C64 uses command stack (SentenceTab, doSentence()) now
- _cmdObject... added for current SentenceTab. The _active... variables are only used to build a sentence in the inventory but never by a script.
-> many routines are not needed anymore and are removed
2012-02-11 08:28:22 +01:00
Tarek Soliman
71f3c54365 SCUMM: Apply modified patch from #3076698
This adds support for the Ultimate Talkie Edition fanpatch

This is authored by the original UTE author LogicDeLuxe and Fingolfin.

Modification:
Removed detection entries
2011-10-04 23:44:05 -05:00
Eugene Sandulenko
10536e285c SCUMM: Fix bug #3306145: INDY3: EGA version script bugs
Based on a patch presented in the bugreport. Fixes several bugs
connected with calcualting IQ points in Amiga versions of Indy3.
2011-07-13 12:33:51 +01:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
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