Commit Graph

55 Commits

Author SHA1 Message Date
Paweł Kołodziejski
093428ae9a and more cleanup
svn-id: r6718
2003-03-06 17:58:13 +00:00
James Brown
a0b77e7389 LCA03 sync: Modified version of the untrap patch, debugger
savegame/loadgame changes, attempts at making the ComI save/load screen
(F1) work. The savegame part of the screen does not work due to a crash,
the load part SHOULD... but something resets the saveload flags before
they are processed (help! :)

svn-id: r6545
2003-01-26 06:17:25 +00:00
Max Horn
38d832ed1f oops
svn-id: r6512
2003-01-19 04:17:13 +00:00
Max Horn
15531663d9 added some comments/changed indention of comments to spaces
svn-id: r6510
2003-01-19 04:10:13 +00:00
Max Horn
ca88dff5e7 work around a script bug in COMI; cleanup; re-enabled array assert
svn-id: r6437
2003-01-12 21:13:22 +00:00
James Brown
daa5397e02 Small fix - _numLocalObjects is a 1-based array, so don't go reading bad memory :P
svn-id: r6417
2003-01-12 08:32:44 +00:00
Max Horn
531e73418f our File class already makes sure we find stuff in the resource subdirectory. Plus, it handles different cases right. So now COMI works from CD on Mac OS X, too
svn-id: r6363
2003-01-08 23:41:27 +00:00
James Brown
9df455ce38 Plop in some better disk switching code for CMI - I have no idea how well this will work transitioning from a disk1 room to a disk2
room in-game, but it works for bootparams and saved games..

svn-id: r6322
2003-01-02 10:36:17 +00:00
Max Horn
166ea5bcee get rid of DUMP_SCRIPTS; in its place, added run time option '-u' to enabled script dumping
svn-id: r6284
2002-12-31 02:09:57 +00:00
James Brown
669e5b8ebc de-verbalise some debug messages (move from debug(1) to debug(2)).. so we can see printDebug lines easier
svn-id: r6227
2002-12-28 12:42:55 +00:00
Max Horn
ae5b30df3d get rid of getStringLen and use the more powerful resStrLen instead; moved resStrLen from common/ to scumm/, where it belongs; enhanced resStrLen to suport V8; fixed translateText to support embeded vars (in strings I mean) - it may still not be fully correct but at least is better now; rewrote o6_arrayOps to parallel the V8 version - needs testing
svn-id: r6215
2002-12-28 01:57:19 +00:00
Max Horn
788fd1e718 like rtRoom, rtRoomScripts should never expire while the room they belong too is loaded; this fixes the crash when picking up the fishing rod
svn-id: r6208
2002-12-27 19:48:30 +00:00
James Brown
fd64fc2b6b Move some things around, to get rid of all these resource/ sprintf's for CMI
svn-id: r6182
2002-12-27 00:11:01 +00:00
Max Horn
7e7be4f6f3 32 bit variables storage
svn-id: r6161
2002-12-26 01:46:36 +00:00
Max Horn
447ab20369 cleanup
svn-id: r6140
2002-12-25 19:06:31 +00:00
Max Horn
190685dc69 added a map from object names to object ids
svn-id: r6104
2002-12-24 16:10:31 +00:00
Max Horn
456877e6f0 fixed room resource loading in V8 - now need to fix initRoomSubBlocks
svn-id: r6091
2002-12-24 02:18:02 +00:00
Max Horn
5135a409d0 upon res load error, print out from which file we tried to load, and also print the correc index (was 'type' instead of 'idx')
svn-id: r6090
2002-12-24 02:03:35 +00:00
Paweł Kołodziejski
44bfa413f9 changed numString to numArray
svn-id: r6078
2002-12-23 19:03:08 +00:00
Paweł Kołodziejski
6f5a18228d changed read order of CMI variables (MAXS)
svn-id: r6076
2002-12-23 18:53:04 +00:00
Max Horn
b8240b253c some flesh to the V8 bones
svn-id: r6073
2002-12-23 17:21:09 +00:00
Max Horn
7d052a26b0 don't be needlessly verbose; allow byte arrays in V8
svn-id: r6071
2002-12-23 16:17:23 +00:00
Max Horn
11a48a2b01 corrected AARY code for V8 (I hope)
svn-id: r6063
2002-12-23 00:21:49 +00:00
Max Horn
df3c41fa24 added some preliminary V8 work. Nope, it is not useful at all, and it doesn't mean we will have CMI support in this millenium, so don't hold your breath
svn-id: r6060
2002-12-22 21:58:16 +00:00
Max Horn
060562c277 partial checkin of patch #655594 (handling Y/N questions); cleanup
svn-id: r6042
2002-12-21 12:34:17 +00:00
Jamieson Christian
f95ea3afdf Fixed problems with instruments after load.
Ignore Adlib-only music when running native MIDI.
(Can't remember why I included them in the first place,
 so until I do remember, it's coming back out.)

svn-id: r6020
2002-12-18 14:57:25 +00:00
Jamieson Christian
50b69cb2db Fixed inappropriate expiration of sound resources,
which fixes concurrency issues esp. in PocketPC and MorphOS.
Stubbed SysEx command 2 (start of song) to get rid of annoying warning.
Changed MT-32 instrument warnings to fit on one (80-char) line.

svn-id: r5842
2002-12-05 21:45:55 +00:00
Max Horn
77a64e0217 more cleanup; fixes out of bound access to _charsetData (but I am not sure if that will be visible anywhere
svn-id: r5833
2002-12-04 15:00:35 +00:00
Max Horn
72c672e14c cleanup
svn-id: r5747
2002-11-29 15:13:49 +00:00
Max Horn
9cefa8611d oops
svn-id: r5738
2002-11-28 23:49:48 +00:00
Max Horn
5ce8324b73 no need to retry 5 times in loadResource - we don't have users with floppy disks anymore, after all :-). Fixed an endian issue for v2 games (makes them crash a little bit later during loading)
svn-id: r5737
2002-11-28 23:47:58 +00:00
Max Horn
d574313f32 fixed o5_resourceRoutines for OLD256 games (various subopcodes are still not implemented, though); some cleanup
svn-id: r5699
2002-11-23 13:53:46 +00:00
Jamieson Christian
c9ed09e7df Revamped Adlib functionality.
IMuseAdlib is defunct.
New MidiDriver_ADLIB device.
Simon 1/2 now supports Adlib.

svn-id: r5677
2002-11-21 19:06:42 +00:00
Jamieson Christian
7bcc2744a4 Support MAC music tracks even in -eadlib mode
svn-id: r5636
2002-11-20 12:54:32 +00:00
Max Horn
7a58ae782e cleaning up scummsys.h a bit (in preparation of using configure eventually). Most notable, uint32 etc. will be 'unsigned int' not 'unsigned long'. Except for 16 bit systems that should be right, and configure will replace this by a proper check for data type sizes anyway
svn-id: r5290
2002-10-23 14:02:46 +00:00
Max Horn
8af300fec3 The terms Word and DWord are somewhat Windows centric; in fact there are systems on which word is 32bit, as opposed to our 16 bits. Hence, use the uin16/uint32 naming scheme, which is not ambigious
svn-id: r5216
2002-10-21 13:23:25 +00:00
James Brown
0b43ca86a7 Patch 623391: Verb shadow fix (MI2)
svn-id: r5150
2002-10-15 10:59:53 +00:00
Paweł Kołodziejski
4cf42ae9a8 added FT imuse music
svn-id: r5127
2002-10-11 08:35:12 +00:00
James Brown
312ff21081 Fix "ripburger attacks Malcom" cutscene, by disabling pseudoRooms for V7 games.
They arn't used in FT at least, so I'm going to assume this could also fix the Dig.

svn-id: r5073
2002-10-02 13:25:06 +00:00
Max Horn
9926433cc1 patch #616195
svn-id: r5039
2002-09-29 17:34:00 +00:00
James Brown
f54715b4c4 Patch #616155: Set Monkey1VGA music instruments dynamically
svn-id: r5035
2002-09-29 15:14:54 +00:00
James Brown
dfdb1f7547 Merge in 615745: GMD via AdLib emulation
Remove MIDIEMU driver obsoleted by patch.
Change functionality to fallback to AdLib/AdLibGMD Emulation where MIDI init fails
Switch to NewGUI by default (old code retained 'Just in case')

svn-id: r5033
2002-09-29 11:11:42 +00:00
James Brown
b5efef6be5 Fix annoying indentation of the CHECK_HEAP macro
svn-id: r5018
2002-09-25 03:09:00 +00:00
James Brown
e9c1d9d802 Patch 613933: Return code for validateresource.
svn-id: r5017
2002-09-25 03:04:28 +00:00
Travis Howell
11aedcbed4 Add fix me
svn-id: r5004
2002-09-22 04:20:20 +00:00
Travis Howell
c0855df382 Add hack from trin to make zak256 sfx/music work again.
Add Makefile changes to Makefile.mingw

svn-id: r5000
2002-09-22 03:58:53 +00:00
Matt Hargett
8390b0cc53 2002-09-21 Matt Hargett <matt@use.net>
* scumm.dsp, scummvm.dsp, simon.dsp: Turn on warning as errors. Generate
    PDBs on all builds.

  * gameDetector.cpp, newgui.cpp, widget.cpp, actor.cpp,
    dialogs.cpp, resource.cpp, saveload.cpp, scumm_renderer.cpp:
    Fix warnings where possible. One pragma added to eliminate
    warning of unknown pragmas.

  * string.cpp: If unknown escape sequence, print warning.

svn-id: r4998
2002-09-22 03:53:53 +00:00
Travis Howell
f1a273e092 Add the following patches:
[ 609649 ] Sound patch for GF_OLD256 games
[ 611997 ] RFC: Timer-based CD audio sync

svn-id: r4986
2002-09-21 13:48:03 +00:00
Paweł Kołodziejski
f7ff5c67fa improved open function in File class
svn-id: r4945
2002-09-15 19:28:34 +00:00
Paweł Kołodziejski
dcf05149fe changed scumm file io to class File
svn-id: r4920
2002-09-10 07:34:27 +00:00