ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,390 Commits 45 Branches 139 Tags
afda37693f0ca8a764c8ea80aef29ca2e83b0ebb
Commit Graph
4390 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Kiehl afda37693f fix compact 
svn-id: r7896
 2003-05-24 18:25:09 +00:00
Oliver Kiehl d7573468aa off by one. *sigh* 
svn-id: r7895
 2003-05-24 18:24:39 +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
Travis Howell 84195fe444 Add some extra code for simon1dos/talkie, doesn't seem to function yet though 
svn-id: r7886
 2003-05-24 13:05:56 +00:00
Travis Howell cf29056768 Typo 
svn-id: r7885
 2003-05-24 12:28:56 +00:00
Travis Howell 13739f18ef More renames 
svn-id: r7884
 2003-05-24 12:26:28 +00:00
Travis Howell e95d717fb1 A few function renames 
svn-id: r7883
 2003-05-24 12:13:23 +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
Travis Howell fa33a173ac Missed one line 
svn-id: r7881
 2003-05-24 10:01:24 +00:00
Travis Howell 7febca050b Remove a few old asserts and xxx which was not needed 
svn-id: r7880
 2003-05-24 09:05:25 +00:00
Travis Howell 3fbae51dc0 Small cleanup 
svn-id: r7879
 2003-05-24 07:55:53 +00:00
Jamieson Christian bc5511c514 Fixed hanging notes when switching tracks 
svn-id: r7878
 2003-05-24 04:39:47 +00:00
Jamieson Christian 807f3e1e86 Fixed MIDI channel conflict between music and MIDI sound effects in simon1dos. 
Also added notes about the GMF header for posterity's sake.

svn-id: r7877
 2003-05-24 03:55:37 +00:00
Travis Howell cd37b391b2 Correct fixme comment 
svn-id: r7876
 2003-05-24 03:51:33 +00:00
Jamieson Christian e23f76b742 Hack to prevent bad music looping at end of simon1win 
svn-id: r7875
 2003-05-24 03:26:12 +00:00
Jamieson Christian 1b4b6030fe Added support for GMF loop specifier 
svn-id: r7874
 2003-05-24 03:10:14 +00:00
Jamieson Christian bcdf2286f8 Fixed problem with hanging notes when switching music tracks 
svn-id: r7873
 2003-05-24 01:42:57 +00:00
Jamieson Christian aacbaac131 Added support for simultaneous music and MIDI sound effects to simon1dos. 
Note that 's' still toggles MIDI sound effects on and off.

svn-id: r7872
 2003-05-24 01:26:05 +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
Max Horn ad4eb36093 oops, fixed ScummVM::Rect constructor (this fixes various string redraw bugs) 
svn-id: r7868
 2003-05-23 17:01:35 +00:00
Max Horn 0439e0fe58 fixed nasty deadlock I recently introduced 
svn-id: r7867
 2003-05-23 16:47:45 +00:00
Torbjörn Andersson 8feba0dfaf cleanup 
svn-id: r7866
 2003-05-23 15:48:07 +00:00
Jamieson Christian e52ca34bb4 Fixed hanging notes when toggling SFX mode in Simon 1 
svn-id: r7865
 2003-05-23 15:27:08 +00:00
Jamieson Christian 790b2e1e9a Fixed problem with Simon music playing even when paused. 
svn-id: r7864
 2003-05-23 15:14:44 +00:00
Jamieson Christian 982883c637 Fixed problem with hanging notes on some synth modules. 
Various little MidiParser fixes.

svn-id: r7863
 2003-05-23 15:04:41 +00:00
Oliver Kiehl 4c0f8eda9a I must have been drunk when I coded this.... 
svn-id: r7862
 2003-05-23 14:27:53 +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
Travis Howell ade97e9fe2 _lock_counter controls seems to control whether mouse cursor should be shown but not sure what the default value should be 
svn-id: r7855
 2003-05-23 11:06:19 +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 7bcdf0d568 Fixed tempo problems in Simon games 
svn-id: r7853
 2003-05-23 04:54:45 +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 0be2b4673c Removed annoying warning 
svn-id: r7851
 2003-05-23 04:35:50 +00:00
Jamieson Christian 08b5337b20 Fixed gcc warning 
svn-id: r7850
 2003-05-23 04:30:50 +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 006d0a5ff8 Removed invalid timer rate 
svn-id: r7848
 2003-05-23 04:16:37 +00:00
Jamieson Christian bb1894e3b7 Fixed VC++ warnings 
svn-id: r7847
 2003-05-23 03:34:18 +00:00