Commit Graph

1701 Commits

Author SHA1 Message Date
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
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
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
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
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
Jamieson Christian
2612a8f817 Added ParameterFader into savegame format.
Savegames are now version 17 (VER_V17).

svn-id: r7808
2003-05-21 21:38:03 +00:00
Max Horn
4a322125fd turn off lots of silly debug output ;-)
svn-id: r7804
2003-05-21 20:34:21 +00:00
Jamieson Christian
38fc644cf6 Replaced VolumeFader with more generic ParameterFader
svn-id: r7803
2003-05-21 20:23:01 +00:00
Jamieson Christian
2dcd2531cf Integrated VolumeFader into each Player
svn-id: r7801
2003-05-21 19:33:50 +00:00
Max Horn
48a27e94e6 fix verb 250 is mapped to 253 in V2, with the 'recursive' flag set
svn-id: r7800
2003-05-21 18:58:29 +00:00
Max Horn
e5152405da fixed V2 entry script dumping
svn-id: r7799
2003-05-21 18:53:00 +00:00
Max Horn
cc2f0e6343 yet more pedantic warning fixes
svn-id: r7796
2003-05-21 18:16:01 +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
Jamieson Christian
c24df81f78 Fixed VC++ warning
svn-id: r7793
2003-05-21 17:34:01 +00:00
Max Horn
8a82e59065 constness fixes
svn-id: r7787
2003-05-21 16:28:02 +00:00
Max Horn
9615441ded uhm... less noisy, please :-)
svn-id: r7783
2003-05-21 14:25:50 +00:00
Max Horn
743d9da78d evil bug in V2 bitvar code fixed -> no more MM cutscene skip crash
svn-id: r7782
2003-05-21 14:25:14 +00:00
Max Horn
e21604663f added v2 cutscene support (not quite complete; and crashes at some point in maniac because VAR_EGO contains a bogus value); cleanup
svn-id: r7781
2003-05-21 14:00:19 +00:00
Max Horn
1d916f2056 fix warnings
svn-id: r7778
2003-05-21 11:22:03 +00:00
Jonathan Gray
280e8a0741 make fingolfin happy :)
svn-id: r7777
2003-05-21 10:38:45 +00:00
James Brown
60ac300bf3 Work on V2 inventory hack a little more
svn-id: r7776
2003-05-21 10:13:06 +00:00
James Brown
0c0cb61876 Move stuff around
svn-id: r7775
2003-05-21 09:29:24 +00:00
James Brown
c3803009b4 Fix this damn userface stuff properly :)
svn-id: r7772
2003-05-21 07:22:43 +00:00
Jonathan Gray
b6dcd5cfae don't error out here to prevent a crash, is the check in softUserputon actually valid here?
svn-id: r7771
2003-05-21 07:13:52 +00:00
James Brown
510fcf5d88 Hack more stuff in :P
svn-id: r7770
2003-05-21 06:18:30 +00:00
James Brown
a318beaa18 Attempt to fix some stuff
svn-id: r7768
2003-05-21 06:14:02 +00:00
James Brown
336e661c36 Hacky zak sentence/inventory drawing (rewrite later on)
svn-id: r7766
2003-05-21 06:00:16 +00:00
Travis Howell
ec46d2f853 Add Zak v2 doSentence fix, patch #740878
svn-id: r7760
2003-05-21 04:09:20 +00:00
Max Horn
34eee8b33b cleanup
svn-id: r7756
2003-05-20 23:05:34 +00:00
Max Horn
49e7f7564a renamed various things for clarity
svn-id: r7754
2003-05-20 20:58:26 +00:00
Max Horn
1a394aa3c7 added enum's for the known actor/object claasses; extended putClass/getClass to translate the X/Y flip classes; made code use the new enum's; some other cleanup
svn-id: r7753
2003-05-20 20:42:28 +00:00
Max Horn
ffadd452a9 got rid of the evil locked-box hack in adjustXYToBeInBox; instead check for locked boxes in walkActorOld, which seems to work just as well (and hopefully better)
svn-id: r7750
2003-05-20 19:35:40 +00:00