Commit Graph

345 Commits

Author SHA1 Message Date
Max Horn
821faf9e03 added convertMac0Resource (which doesn't do anything yet, but is the place we can add Mac0 support in later); factored out some common code in convertADResource; fixed memory leak when convertADResource was called; misc cleanup
svn-id: r10117
2003-09-09 00:13:19 +00:00
Max Horn
0012f7fa96 added common base class MusicEngine for iMuse/iMuseDigital/Player_V123 (initial stab, more work to follow)
svn-id: r10066
2003-09-07 16:16:19 +00:00
Travis Howell
9de8a0cfa9 Add music player for Amiga versions of indy3ega/loom from unused.
Revert last change to common.rules for now, it broke compile.

svn-id: r10061
2003-09-07 07:23:20 +00:00
Max Horn
457f2fc211 rearranged GameFeatures constants a bit
svn-id: r10027
2003-09-05 22:53:46 +00:00
Travis Howell
3187b565dd Add atarist and macintosh options, since there seem to be no way to detect version been used.
svn-id: r9999
2003-09-05 07:36:05 +00:00
Jonathan Gray
176803cb90 make the 2nd gen windows based humongous games that have things like a different layout in the MAXS block at least start the bootscript, added pjs-demo target to test with
svn-id: r9897
2003-08-29 02:39:05 +00:00
Travis Howell
06d07054c3 Fix room palette issues in small_header games.
Fix is only for EGA games so far.

svn-id: r9873
2003-08-27 01:12:18 +00:00
Max Horn
09368e09f2 fix for bug #786994 (DOTT: no custom cursor)
svn-id: r9850
2003-08-24 17:37:28 +00:00
Travis Howell
d6105a3064 Cleanup v1/v2 color settings for sentance/inventory/verb area.
Add highlight color for v1 maniac

svn-id: r9774
2003-08-19 04:15:14 +00:00
Jonathan Gray
413f09eff5 add maniacnes target, rather prelimary so people would be well advised not to add to compatibility at this point
svn-id: r9690
2003-08-14 11:40:50 +00:00
Travis Howell
679bc2d271 Adds finals changes for choice of sound formats in older games.
Only works wit monkeyvga, since ScummVM has it set as version 4.
Remove some old debugging comments

svn-id: r9659
2003-08-13 15:37:28 +00:00
Jamieson Christian
fb62ba61ca Added PC Speaker and PCjr command line options,
in preparation for Kirben's addition of WA support
for games that already have AD tracks.

svn-id: r9656
2003-08-13 14:08:21 +00:00
Travis Howell
603f8b8e3a Give pass its own id
svn-id: r9654
2003-08-13 02:21:36 +00:00
Jamieson Christian
a52b44f3fe Expanded iMuse debugger commands. All iMuse
commands are now under "imuse", and underscores
have been removed.

imuse panic - Stop all music tracks
imuse multimidi on/off - Set multimidi
imuse play # - Play a sound resource
imuse play random - Play a random sound resource
imuse stop # - Stop a music resource
imuse stop all - Stop all music resources

Note that "play #" and "play random" only attempt
to play a sound resource. If the resource is not
a music resource or is in a format not supported by
the current music driver, it won't play.

You can use this as a mini jukebox, but be sure
you're in a room with minimal activity. The
goal is to minimize interference from the scripts
while playing sounds that are not expected in
that room.

svn-id: r9641
2003-08-11 14:48:21 +00:00
Jonathan Gray
f1a3253fa2 remove GF_LOOM
svn-id: r9603
2003-08-08 11:32:40 +00:00
Max Horn
3e0cd37cea get rid of GF_INDY3 again, and also remove GID_INDY3_256 and GID_INDY3_TOWNS
svn-id: r9554
2003-08-06 12:04:27 +00:00
Travis Howell
5dd4d3e8e4 Add GF_LOOM feature flag for loom games to reduce checks.
Will make it easier to add loom fm towns target in future.

svn-id: r9547
2003-08-06 09:30:48 +00:00
Travis Howell
e4e9538038 Add GF_INDY3 feature flag for indy3 games to reduce checks
Remove GF_ADLIB_DEFAULT since it is no longer used

svn-id: r9546
2003-08-06 09:10:19 +00:00
Travis Howell
8bf012d966 Add adlib music improvements for indy3/monkeyega/monkeyvga and cleanups from patch #770862
svn-id: r9480
2003-08-05 05:21:57 +00:00
Travis Howell
11aa36ff90 Add option for the demo included in Maniac Mansion (Classic version)
svn-id: r9279
2003-07-29 12:13:39 +00:00
Max Horn
7caa1a0c9e removed _encbyte (it's only used locally)
svn-id: r9252
2003-07-28 16:55:06 +00:00
Max Horn
d592095fb9 Patch #715991: Quit Confirmation Dialog (feature request #642721) with some tweaks by me
svn-id: r9210
2003-07-28 01:36:16 +00:00
Torbjörn Andersson
3b033956aa Changed "SCALLING" to "SCALING".
svn-id: r9134
2003-07-22 20:53:01 +00:00
Max Horn
0b1b753797 added getResourceSize method
svn-id: r9109
2003-07-21 21:28:47 +00:00
Max Horn
c7958d8d8b merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code
svn-id: r9085
2003-07-20 00:02:24 +00:00
Max Horn
2fbf782c05 moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical
svn-id: r9083
2003-07-19 18:18:01 +00:00
Travis Howell
f20c47bb21 Add Indy3 FM Towns support, patch #773434
svn-id: r9062
2003-07-18 05:49:21 +00:00
Max Horn
c74e2eb4d7 factored out some duplicate code into a new method translateTextAndPlaySpeech; removed some completely useless code (why compute 'pointer' when we then throw away the result?)
svn-id: r9045
2003-07-15 21:30:53 +00:00
Travis Howell
73365aa2c7 Split the v1 palette, since there is a minor difference.
svn-id: r8999
2003-07-14 06:44:47 +00:00
Travis Howell
ffddfd76d9 Add correct palette for pc versions of v1 games
Add some correct colors for v1 games

svn-id: r8988
2003-07-13 15:13:43 +00:00
Nicolas Bacca
524991b073 Add KEY_ALL_SKIP for WinCE
svn-id: r8939
2003-07-12 10:35:38 +00:00
Travis Howell
4c6e10bfd6 Add amiga pallete for Amiga versions
svn-id: r8904
2003-07-11 09:38:46 +00:00
Paweł Kołodziejski
2e0235d898 added GID_PUTTPUTT game id for puttputt games to prevent use samnmax hacks
svn-id: r8807
2003-07-06 16:51:22 +00:00
Max Horn
92fd56f9f0 removed #include "boxes.h" from scumm.h; cleaned up AdjustBoxResult definition & usage; properly deal with larger box distances, thus partially fixing Zak on the airport (but original seems to have used a very different algorithm, so this really is only a partial fix)
svn-id: r8710
2003-07-02 13:47:03 +00:00
Max Horn
1ec54d032e Moved out akos_compare (no reason for it to be member of class Scumm)
svn-id: r8660
2003-06-26 22:50:01 +00:00
Max Horn
7a79ef8f5f added getOBIMFromObject and getObjectImage methods; changed code to use those
svn-id: r8651
2003-06-26 01:46:41 +00:00
Max Horn
7f3118f8d8 more const qualifiers
svn-id: r8649
2003-06-25 23:49:54 +00:00
Max Horn
870ce2879e added some const qualifiers; moved _bundle & _current_cd_sound from class Scumm to class Sound; some other tweaks
svn-id: r8648
2003-06-25 23:25:52 +00:00
Jonathan Gray
20b3ba1d28 add id for segacd monkey island and don't attempt to play sbl sounds for now
svn-id: r8555
2003-06-19 12:29:13 +00:00
Torbjörn Andersson
5a2678b72a Make the mouse-over hilight work again on the inventory arrows in V2 games.
svn-id: r8523
2003-06-17 07:11:58 +00:00
Max Horn
101df28e0b moved GameId declaration to common/engine.h (more logical); moved scumm specific stuff from gameDetector.h to scumm.h; cleaned up some #includes (ideally, never #include something in a header file if you can avoid it - this cuts down interdepencies)
svn-id: r8496
2003-06-15 01:42:19 +00:00
Max Horn
4e57157cda renamed _bcr -> _costumeRenderer
svn-id: r8473
2003-06-14 13:38:22 +00:00
Max Horn
f4a31da513 runHook -> runInventoryScript, VAR_HOOK_SCRIPT -> VAR_INVENTORY_SCRIPT
svn-id: r8468
2003-06-14 12:23:30 +00:00
Max Horn
aa83d4fd31 cleanup
svn-id: r8467
2003-06-14 11:52:34 +00:00
Jonathan Gray
aabfc254c1 rework loom subtitle option handing
svn-id: r8448
2003-06-12 16:38:43 +00:00
Jonathan Gray
c26bdae207 hook subtitle variable up to f9 for loomcd
svn-id: r8446
2003-06-12 12:22:57 +00:00
Torbjörn Andersson
ab7f8b3378 Fixed recent regression (too many blast texts) in The Dig's end credits and
made the text scroll off the screen instead of just vanishing at the top.
(The latter also applies to Full Throttle's end credits.)

svn-id: r8402
2003-06-08 15:17:14 +00:00
Max Horn
a1caf1f9f9 forgot to check this one in
svn-id: r8400
2003-06-08 12:56:42 +00:00
Max Horn
f8ec8a9903 cleanup
svn-id: r8399
2003-06-08 12:49:34 +00:00
Max Horn
be9e6e85db added quit event
svn-id: r8398
2003-06-08 12:11:14 +00:00
Max Horn
04db5c12ab make version public
svn-id: r8366
2003-06-06 23:55:00 +00:00
Max Horn
4b227da824 Preparations for removing GF_AFTER_V? flags
svn-id: r8364
2003-06-06 22:51:33 +00:00
James Brown
c89b04488d Get rid of *64 targets, use 'maniac' and 'zak' autodetection for the AFTER_V1 flag instead.
svn-id: r8348
2003-06-06 10:47:12 +00:00
Paweł Kołodziejski
94bbf1b9a0 added v1 gfx codec, (not working)
svn-id: r8329
2003-06-05 17:22:15 +00:00
Bertrand Augereau
23196c1257 added a global CostumeRenderer in the VM, to avoid actors reinstancing it every time
svn-id: r8307
2003-06-05 02:44:18 +00:00
Bertrand Augereau
69b55ea45f put a setFeatures member that allows to precompute game-wide stuff, such as CostumeRenderer, when features change, ie extremely rarely
svn-id: r8301
2003-06-04 23:03:23 +00:00
Max Horn
ffef453d1a cache room strip offsets (this should help performance on PalmOS)
svn-id: r8300
2003-06-04 21:45:29 +00:00
Max Horn
6fd0e4a07f Patch #747021: DIG&CMI 2 byte charset support (very heavily modified by me; still needs more cleanup but already works well enough)
svn-id: r8293
2003-06-04 14:37:43 +00:00
Max Horn
3baff34226 use enqueueText for FT, too
svn-id: r8284
2003-06-02 23:54:52 +00:00
Max Horn
35f29951eb moved blast text code to string.cpp
svn-id: r8282
2003-06-02 23:18:52 +00:00
Paweł Kołodziejski
6dbd36d668 more v1 load directory ...
svn-id: r8274
2003-06-02 18:15:09 +00:00
Max Horn
4292d621af cleaned up the restart/pause/shutdown situation a bit; added comment that explains how restart might be implemented
svn-id: r8260
2003-06-02 02:25:24 +00:00
Max Horn
cb5fb5d403 added a getMaskBuffer method (makes it easier to read some of the code); merged setVirtscreenDirty() into updateDirtyRect(); made setDirtyRange a method of struct VirtScreen
svn-id: r8241
2003-06-01 14:30:26 +00:00
Max Horn
9cbcde684b cleanup / added comments / code unification
svn-id: r8235
2003-06-01 13:09:30 +00:00
Max Horn
5202a59c63 some setObjectName changes. I'd really like to switch V2-V5 to use rtObjectName resources, too
svn-id: r8171
2003-05-31 12:17:58 +00:00
Max Horn
d5d0440e8c cleanup
svn-id: r8169
2003-05-31 11:57:18 +00:00
Max Horn
9b8f49e900 Use language index for The Dig, too
svn-id: r8159
2003-05-30 23:24:29 +00:00
Max Horn
3efdd3ad6b continously opening and closing the language.bnd file is rather inefficient. It's about 400k, though...
svn-id: r8158
2003-05-30 22:57:19 +00:00
Max Horn
eb039ec554 some cheap doxygen docs; cleanup
svn-id: r8154
2003-05-30 20:13:29 +00:00
Max Horn
c6b35e15a0 moved bomp stuff into own files; removed some of our 6 (!) bomp decoders
svn-id: r8151
2003-05-30 19:00:33 +00:00
Max Horn
90468ea46e cleanup
svn-id: r8150
2003-05-30 17:52:17 +00:00
Max Horn
5725ee392a code unification
svn-id: r8146
2003-05-30 15:39:06 +00:00
Max Horn
3d28cfaf82 cleanup
svn-id: r8145
2003-05-30 15:06:29 +00:00
Max Horn
61de12d3a1 Modified version of erik's patch #745986: Experimental V2 mouseover stuff
svn-id: r8142
2003-05-30 14:29:07 +00:00
Max Horn
691e1f390a rewrote Actor::needBgReset related code (this could cause regressions...)
svn-id: r8126
2003-05-30 00:55:21 +00:00
Max Horn
d0b2e56194 more camera spliting
svn-id: r8121
2003-05-29 23:44:24 +00:00
Max Horn
1db0f749ca moved camera stuff to own file
svn-id: r8099
2003-05-29 12:55:28 +00:00
Max Horn
34bf11b43f spelling
svn-id: r8062
2003-05-28 21:28:30 +00:00
Max Horn
1f70da0155 const as const can!
svn-id: r8058
2003-05-28 20:01:47 +00:00
Max Horn
1374e7c6b1 Patch #743228: Storing mouse cursor info in savegames; Also, increased NUM_SCRIPT_SLOT to 80 (done at the same time so I only have to up the save game version once)
svn-id: r8050
2003-05-28 18:13:30 +00:00
Jamieson Christian
dbad55e532 Added Hoenicke's PC-speaker waveform generator
and script interpreter for GF_OLD_BUNDLE music resources.

We'll try to get the waveform generator into a
MidiDriver wrapper for use with the 'SPK' resources
of later games, but this is usable for now.

Great work, Hoenicke!

svn-id: r8023
2003-05-26 22:03:04 +00:00
Max Horn
8eec984eb7 more const qualifiers
svn-id: r8002
2003-05-26 13:14:57 +00:00
Max Horn
2f9ff35bad moved Actor SaveLoadEntry definition to actor.cpp; made findPathTowards/findPathTowardsOld members of Actor; cleanup
svn-id: r7988
2003-05-26 02:26:13 +00:00
Max Horn
80eab4c3c4 hook language command switch to V2 font / prepositions
svn-id: r7970
2003-05-25 20:38:44 +00:00
Max Horn
9ba6f4b432 made more stuff protected
svn-id: r7921
2003-05-25 00:47:36 +00:00
Max Horn
0384d27e83 (somewhat hackish) support for COMI CD changing on Mac OS X; reordered stuff in scumm.h
svn-id: r7908
2003-05-24 22:17:45 +00:00
Max Horn
28eade1da4 when iterating from 1 to _numActors over all actors, use _actors[] directly instead of derefActor() (unnecessary overhead); added range check to derefActor, and error out if invalid actor is accessed
svn-id: r7858
2003-05-23 12:48:50 +00:00
Max Horn
a9788c771a from the MM/Zak scripts, the code etc. it's clear that unk2 is the sentence preposition
svn-id: r7827
2003-05-22 14:10:20 +00:00
Max Horn
86d57f3c7a many pedantic warning fixes (and some actual potential buglets fixed, too)
svn-id: r7795
2003-05-21 18:09:49 +00:00
Max Horn
8a82e59065 constness fixes
svn-id: r7787
2003-05-21 16:28:02 +00:00
James Brown
60ac300bf3 Work on V2 inventory hack a little more
svn-id: r7776
2003-05-21 10:13:06 +00:00
James Brown
0c0cb61876 Move stuff around
svn-id: r7775
2003-05-21 09:29:24 +00:00
James Brown
c3803009b4 Fix this damn userface stuff properly :)
svn-id: r7772
2003-05-21 07:22:43 +00:00
Max Horn
49e7f7564a renamed various things for clarity
svn-id: r7754
2003-05-20 20:58:26 +00:00
Max Horn
1a394aa3c7 added enum's for the known actor/object claasses; extended putClass/getClass to translate the X/Y flip classes; made code use the new enum's; some other cleanup
svn-id: r7753
2003-05-20 20:42:28 +00:00
Max Horn
18a6b5dcc1 renamed ScriptSlot::unk1/unk2 to freezeResistant/recursive
svn-id: r7688
2003-05-19 11:31:35 +00:00
Max Horn
b43bca21cb more cleanup
svn-id: r7653
2003-05-18 23:46:30 +00:00
Max Horn
1f616edfcd VAR_CHARCOUNT is a V2 only variable, so I moved its declaration to the other V2 only vars
svn-id: r7651
2003-05-18 23:37:44 +00:00
Max Horn
3576b8e168 yet another V2 sentence fix (now clicking on objects in Zak causes Zak to talk to it - but he gets stuck after some time)
svn-id: r7613
2003-05-17 18:42:31 +00:00
James Brown
2813d48e92 Cleanup
svn-id: r7598
2003-05-17 06:14:08 +00:00