libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-02 15:38:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,417 Commits 5 Branches 5 Tags 1.8 GiB
4c09e5472f
Commit Graph

1749 Commits

Author SHA1 Message Date
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
9ba6f4b432 made more stuff protected 
svn-id: r7921
 2003-05-25 00:47:36 +00:00
Max Horn
54835862fb cleanup 
svn-id: r7920
 2003-05-25 00:30:48 +00:00
Max Horn
95b7e01548 cleanup 
svn-id: r7919
 2003-05-25 00:04:16 +00:00
Max Horn
cb76f85ca6 correction for zak256 SFX 
svn-id: r7918
 2003-05-24 23:51:57 +00:00
Max Horn
d356ba4452 simplified addIntToStack a bit *cough*; added experimental code for the message opcode 7 in V2 codes (see also patch #742851) 
svn-id: r7917
 2003-05-24 23:39:40 +00:00
Jonathan Gray
0bd1f1d958 er oops 
svn-id: r7914
 2003-05-24 23:21:08 +00:00
Max Horn
0d2ddf2381 work around for comi script calling o6_getActorRoom(255) 
svn-id: r7912
 2003-05-24 23:08:03 +00:00
Max Horn
684b7288f3 change behaviour for loading save games from the command line so that if you load a COMI save game from disk 2, you don't have to first insert disk 1 
svn-id: r7910
 2003-05-24 22:42:26 +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
4cda099c57 don't use _gameDataPath directly; minor cleanup 
svn-id: r7907
 2003-05-24 22:13:01 +00:00
Max Horn
41a9cd8ac4 fixed flashlight oddities in Zak256 
svn-id: r7904
 2003-05-24 21:33:54 +00:00
Jamieson Christian
0768f103ea Put the comment back on IMUSE_DEBUG. Duh. 
svn-id: r7903
 2003-05-24 19:51:29 +00:00
Jamieson Christian
66c2533681 Possible fix for hanging notes in iMuse 
svn-id: r7902
 2003-05-24 19:50:34 +00:00
Jamieson Christian
34162afd9e Removed more unnecessary code 
svn-id: r7901
 2003-05-24 19:43:20 +00:00
Jamieson Christian
30affb5fbc Various iMuse cleanup 
svn-id: r7900
 2003-05-24 19:20:52 +00:00
Max Horn
9d95b025cd fixed roomOps:1 (thanks to Hoenicke) 
svn-id: r7894
 2003-05-24 17:18:23 +00:00
Max Horn
7bc1399e00 this change seems to be 'logical', but could be wrong; would be nice to check the assembly... 
svn-id: r7893
 2003-05-24 17:07:50 +00:00
Max Horn
2efa2e1c67 cleanup 
svn-id: r7892
 2003-05-24 17:04:54 +00:00
Max Horn
f75c148c8c corrected FIXME 
svn-id: r7891
 2003-05-24 16:45:49 +00:00
Max Horn
07df5bd181 cleanup / minor tweak 
svn-id: r7890
 2003-05-24 16:11:47 +00:00
Max Horn
41df21ed6b temporary work around for bug #742676 (game won't exit anymore, but behaviour is incorrect) 
svn-id: r7889
 2003-05-24 16:09:29 +00:00
Max Horn
ac3f871910 some more debug output 
svn-id: r7888
 2003-05-24 16:02:07 +00:00
Jamieson Christian
0ffc4fe7da Fix for bug [742688] FOA: Missing music at Sophia's lecture. 
Added check for 0-length parameter fades, just in case.

svn-id: r7887
 2003-05-24 16:00:18 +00:00
Jonathan Gray
9b0e0d14db we want a word not a byte for object numbers, bug pointed out by Hoenicke 
svn-id: r7882
 2003-05-24 10:39:13 +00:00
Jonathan Gray
c8276b4684 returning 1 instead of the id is the correct behaviour I believe, but the scripts check for a 0 result so either will work. I'm just picky :) 
svn-id: r7871
 2003-05-24 01:20:50 +00:00
Max Horn
0361f5a6c0 bypass for Zak256 copy protection (can't test this right now, though) 
svn-id: r7870
 2003-05-23 23:24:48 +00:00
Jamieson Christian
eb09051517 Added XMIDI support to IMuse. IMuse now plays music from Humongous games. 
Added some IMuse property options to support some assumptions that seem to be made by Humongous games.

This is still preliminary. It will play music, and it will switch between songs. But I don't know if it's switching to the right song at the right time.

svn-id: r7869
 2003-05-23 18:35:53 +00:00
Torbjörn Andersson
8feba0dfaf cleanup 
svn-id: r7866
 2003-05-23 15:48:07 +00:00
Jamieson Christian
4c531d373b Fixed VC++ warning 
svn-id: r7861
 2003-05-23 13:45:45 +00:00
Max Horn
94f0b7f4a7 some more derefActorSafe -> derefActor changes; found out why in COMI o6_getActorRoom is called with param 0 
svn-id: r7860
 2003-05-23 13:42:12 +00:00
Max Horn
c333b6d6ec replaced many unsafe uses of derefActorSafe by derefActor; replaced derefActorSafe/assert pairs by derefActor (gives better error message); replaced various derefActorSafe/if(a!=0) pairs by derefActor (in cases where the deref should never fail, ever, except due to a bug in ScummVM) 
svn-id: r7859
 2003-05-23 13:24:41 +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
f802c2a7ba clarified / tightened the o5_actorSet hack for actor 0 (it seems to be there for the same reasons as in V2: only to set a default actor talk color) 
svn-id: r7857
 2003-05-23 12:08:36 +00:00
Max Horn
bdaefa6727 don't hardcode 9 but rather use the default actor talk color as given in the (v2) bootscript 
svn-id: r7856
 2003-05-23 12:07:36 +00:00
James Brown
73c6cf8bc9 Patch #742132: o2_setobjectname script overwrite fix 
svn-id: r7854
 2003-05-23 06:35:47 +00:00
Jamieson Christian
c9e5988e43 Fixed PPQN for old 'AD' music resources 
svn-id: r7852
 2003-05-23 04:47:47 +00:00
Jamieson Christian
c6568530bd Revamped iMuse and Player classes. Player now uses MidiParser to parse its data, which will allow it to parse other MIDI formats. To receive parsed data, Player now derives from MidiDriver to act as a "fake MIDI driver". 
Miscellaneous upgrades and fixes to MidiParser, including the Smart Jump (which could not be tested before iMuse started making use of the MidiParser).

*** THIS IS A BIG UPGRADE! EXTENSIVE REGRESSION TESTING IS NEEDED! ***

This has been tested through the intros and a number of other scenes from MI2, FOA and S&M.

NOTE! This upgrade introduces savegame format version V19. Earlier version savegames will load, but the music will simply start over from the beginning. Only V19 and later games will properly restore the position of the music! Don't say you weren't warned....

svn-id: r7849
 2003-05-23 04:19:47 +00:00
Jamieson Christian
bb1894e3b7 Fixed VC++ warnings 
svn-id: r7847
 2003-05-23 03:34:18 +00:00
Max Horn
a0a096e2e8 added support in the save/load system for 2 dimensional arrays; used this for save/load of localvars -> this fixes many old save games, and allows us to be future compatible 
svn-id: r7846
 2003-05-23 02:58:34 +00:00
Max Horn
cafb78a83c v2 fix for o5_getDist (thx segra) 
svn-id: r7845
 2003-05-23 01:33:43 +00:00
Max Horn
1740bfcee3 added tons of asserts; added warnings for other cases where we so far silently ignored invalid actors; replaced a few of such warnings with asserts (if they are needed somewhere, feel free to re-add them, but this time with a comment explaining *why* - i.e. bug id, or explanation on how to reproduce the problem) 
svn-id: r7844
 2003-05-23 01:32:15 +00:00
Max Horn
ddd0b6aa69 fixed butterknife + cashcard 
svn-id: r7843
 2003-05-23 01:14:29 +00:00
Max Horn
9e58883009 added two more redrawV2Inventory invocations; removed calls to runHook (it does nothing in V2) 
svn-id: r7842
 2003-05-23 00:59:46 +00:00
Max Horn
4fc70168b4 o5_walkActorToActor cleanup, and fixed for V2 
svn-id: r7841
 2003-05-23 00:52:31 +00:00
Max Horn
edf5946c40 some well placed asserts (triggering any of those means with 99% a bug in some other place; so don't just remove the asserts if you trigger one of 'em! 
svn-id: r7840
 2003-05-23 00:22:41 +00:00
Max Horn
47246c35b3 this fixme doesn't seem to be needed anymore 
svn-id: r7839
 2003-05-23 00:04:17 +00:00
Max Horn
beb42d7281 oops, swapped set/clear state 2 
svn-id: r7838
 2003-05-22 23:45:34 +00:00
Max Horn
b084e13431 fixed more V2 clear/set state opcodes 
svn-id: r7837
 2003-05-22 23:01:25 +00:00