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
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
86814 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Max Horn 2b13ad92e4 fixed Zak cashcard 
svn-id: r7836
 2003-05-22 22:42:44 +00:00
Max Horn 1383ccbdbe make sure that the mutex protects everything that affects the buffer 
svn-id: r7835
 2003-05-22 21:34:20 +00:00
Max Horn c152233f80 get rid of some tables 
svn-id: r7834
 2003-05-22 21:24:36 +00:00
Jamieson Christian 789d904c4c Added new module to project files 
svn-id: r7833
 2003-05-22 16:23:05 +00:00
Jamieson Christian 3c0fdf9917 Separated IMuse Player into its own file 
svn-id: r7832
 2003-05-22 16:15:48 +00:00
Jamieson Christian 1918dc555f Added "smart-jump" capability to MidiParser. 
svn-id: r7831
 2003-05-22 15:34:30 +00:00
Max Horn 10fad2635a not needed anymore since we read the preposition flag directly from the obcd data again 
svn-id: r7830
 2003-05-22 15:30:27 +00:00
Max Horn 871df7fb57 restricted getObjectIndex to only search thru _objs, not _inventory(to avoid future confusion), this might cause regressions, though; fixed o2_getObjPreposition; adapted some code to the changed getObjectIndex 
svn-id: r7829
 2003-05-22 15:27:44 +00:00
Max Horn a6c8b58045 endian fix 
svn-id: r7828
 2003-05-22 14:22:35 +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 711c698948 fixed o2_ifClassOfIs 
svn-id: r7826
 2003-05-22 13:57:34 +00:00
Max Horn 552f9fad61 small V2 doSentence tweak 
svn-id: r7825
 2003-05-22 13:18:54 +00:00
James Brown 766b7856af Fix sentence building 
svn-id: r7824
 2003-05-22 12:30:19 +00:00
Jonathan Gray aafa8c0722 make drawSentence not crash on us 
svn-id: r7823
 2003-05-22 11:40:20 +00:00
Max Horn a5be83b352 fixed meteor animation in MM (and probably others in MM and Zak) 
svn-id: r7822
 2003-05-22 10:40:49 +00:00
Travis Howell a7a063bd73 MAke debug output a little easier to read, a few corrections 
svn-id: r7821
 2003-05-22 10:21:05 +00:00