libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-26 03:37:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,764 Commits 5 Branches 5 Tags 1.8 GiB
04fdd5bc52
Commit Graph

292 Commits

Author SHA1 Message Date
Travis Howell
383918313d Treat AMI music resoucres in monkey2 for Amiga as ROL for now, to allow music playback 
svn-id: r8046
 2003-05-28 11:56:50 +00:00
Max Horn
8eec984eb7 more const qualifiers 
svn-id: r8002
 2003-05-26 13:14:57 +00:00
Jamieson Christian
2824acd4ed Corrected target loopback point for 'AD' conversion 
svn-id: r7924
 2003-05-25 02:02:37 +00:00
Jamieson Christian
4c09e5472f Finishing the fix 
svn-id: r7923
 2003-05-25 01:48:59 +00:00
Jamieson Christian
45a2148d98 Possible fix for [742962] MI1VGA - Crash at Scumm Bar. 
Fixes End of Track that is rewritten from 'AD' resource.

svn-id: r7922
 2003-05-25 01:42:53 +00:00
Max Horn
95b7e01548 cleanup 
svn-id: r7919
 2003-05-25 00:04:16 +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
Jamieson Christian
c9e5988e43 Fixed PPQN for old 'AD' music resources 
svn-id: r7852
 2003-05-23 04:47:47 +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
9517305332 warning -> debug message 
svn-id: r7733
 2003-05-20 15:03:47 +00:00
Max Horn
8d1110bfee init all Bundle members properly; make _voiceFile/_musicFile protected 
svn-id: r7718
 2003-05-20 11:56:36 +00:00
Jonathan Gray
714cd3503d make gui work if the requested string vars don't exist 
svn-id: r7674
 2003-05-19 08:42:10 +00:00
Max Horn
7171c5bcd4 cleanup 
svn-id: r7646
 2003-05-18 21:03:57 +00:00
Jamieson Christian
5a15ce808a Feature [557411] Adlib sound effects with GM drivers. 
Support for simultaneous drivers is based on a
#define in imuse.cpp, and is disabled by default.

svn-id: r7582
 2003-05-16 22:00:33 +00:00
Jonathan Gray
52832cc954 some updates that get us up to the bootscripts of he v7 games before erroring out on unimplemented opcodes 
svn-id: r7576
 2003-05-16 16:09:16 +00:00
Max Horn
08f7ec192e NUM_ACTORS -> _numActors (for consistency) 
svn-id: r7489
 2003-05-13 23:42:41 +00:00
Max Horn
0ee0e7f634 cleanup 
svn-id: r7488
 2003-05-13 23:33:01 +00:00
Max Horn
98881c3a6a init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning 
svn-id: r7393
 2003-05-08 15:48:50 +00:00
Jamieson Christian
15bf5ba885 ..\..\msg.txt 
svn-id: r7382
 2003-05-07 19:24:14 +00:00
Max Horn
b7a3f481a8 added music looping for MonkeyVGA/EGA and Indy3 
svn-id: r7283
 2003-05-03 12:48:18 +00:00
Max Horn
8a5dbd57e6 shouldn't work so late at night, only make mistakes 
svn-id: r7257
 2003-05-02 00:54:01 +00:00
Max Horn
73ab9b26ad umpf 
svn-id: r7256
 2003-05-01 22:26:30 +00:00
Max Horn
0b265f8608 cleanup 
svn-id: r7255
 2003-05-01 22:19:10 +00:00
Max Horn
27f094a3b0 fixed music tempo in indy3/monkeyvga etc. 
svn-id: r7253
 2003-05-01 21:04:38 +00:00
Max Horn
99254eedc8 khalek, your patch didn't handle Indy (the original cause for my patch). This oneshould work better. 
svn-id: r7251
 2003-05-01 14:35:21 +00:00
Jonathan Gray
d2a402f5fd unbreak costumes in most games 
svn-id: r7242
 2003-05-01 11:40:21 +00:00
Max Horn
c77cbc5cb4 Fixed bug #730030: INDY3: Crash when loading new savegames 
svn-id: r7240
 2003-05-01 11:03:41 +00:00
Max Horn
2b74abd2c9 PalmOS changes 
svn-id: r7224
 2003-04-30 13:23:31 +00:00
Jonathan Gray
a8f140e7d8 make all known file extensions of resource files work 
svn-id: r7190
 2003-04-29 03:32:08 +00:00
Max Horn
e13e117976 pedantic checks 
svn-id: r7177
 2003-04-28 13:16:37 +00:00
Jonathan Gray
b4165b0242 add some he v7 blocks 
svn-id: r7173
 2003-04-28 05:54:54 +00:00
Jonathan Gray
1d01a68cac close bundle files when changing discs in comi 
svn-id: r7023
 2003-04-20 00:56:23 +00:00
Max Horn
3ffafcfdf3 just in case... 
svn-id: r6997
 2003-04-12 20:12:52 +00:00
Max Horn
dbff83a88b fixed resource loading in GF_OLD_BUNDLE games (res header = 2 bytes length, plus 2 unknown bytes) 
svn-id: r6976
 2003-04-11 22:15:59 +00:00
Max Horn
8c78049154 made unblocked games get a little farther before crashing 
svn-id: r6967
 2003-04-11 11:40:35 +00:00
Paweł Kołodziejski
6dd0b2d9bb changed printf to debug 
svn-id: r6883
 2003-03-29 15:56:42 +00:00
Paweł Kołodziejski
aa3766018f updated copyrights headers 
svn-id: r6726
 2003-03-06 21:46:56 +00:00
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
Max Horn
70eec52941 minor tweaks 
svn-id: r4872
 2002-08-30 20:47:48 +00:00
Max Horn
41c2d6fba3 sound system cleanup 
svn-id: r4867
 2002-08-29 23:45:15 +00:00
Max Horn
4b83c17b31 some cleanup/refactoring 
svn-id: r4866
 2002-08-29 20:01:27 +00:00
Max Horn
bbcae3efbe experimental support for the V2 resource format (patch #601560) 
svn-id: r4864
 2002-08-29 16:57:43 +00:00
Max Horn
ce46866403 Initial revision 
svn-id: r4785
 2002-08-21 16:07:07 +00:00