Commit Graph

4352 Commits

Author SHA1 Message Date
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
Travis Howell
478b62ce45 Simon debug output name update
svn-id: r7820
2003-05-22 10:06:39 +00:00
Max Horn
c78664cbc9 renamed talkFrame1/talkFrame2 to talkStartFrame/talkStopFrame
svn-id: r7819
2003-05-22 09:58:33 +00:00
Max Horn
061228688e fix V2 actor initial mouth's (they were missing)
svn-id: r7818
2003-05-22 09:52:21 +00:00
James Brown
573678abc0 V2 Inventory scrolling, etc
svn-id: r7817
2003-05-22 05:44:18 +00:00
James Brown
19bbee7843 Fix V2 userface stuff in savestate
svn-id: r7816
2003-05-22 05:21:48 +00:00
Max Horn
f43fb0dab8 freeze scripts & hide mouse during cutscenes; addde Actor::isPlayer method that should work in V2, too; fixed o2_walkActorToObject
svn-id: r7815
2003-05-22 00:51:42 +00:00
Max Horn
340f3a650e fix o2_getObjUnknown -> fixes 'use' verb
svn-id: r7814
2003-05-22 00:14:28 +00:00
Jamieson Christian
b2f4c34c01 Reset channel volumes on load
svn-id: r7813
2003-05-22 00:06:24 +00:00
Jamieson Christian
3b08208879 Fixed premature music load in Simon 2
svn-id: r7812
2003-05-22 00:00:42 +00:00
Max Horn
b12d741ac1 cleaned up V2 input code
svn-id: r7811
2003-05-21 23:54:39 +00:00
Max Horn
b958c0a002 add in preposition to dual verbs (e.g. 'give'); put in hard coded key codes for V2 verbs
svn-id: r7810
2003-05-21 23:46:02 +00:00
Max Horn
85e92f4fae cutscene override fix for V3 games (bug #731985)
svn-id: r7809
2003-05-21 21:41:27 +00:00