Commit Graph

172 Commits

Author SHA1 Message Date
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
James Brown
573678abc0 V2 Inventory scrolling, etc
svn-id: r7817
2003-05-22 05:44:18 +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
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
4a322125fd turn off lots of silly debug output ;-)
svn-id: r7804
2003-05-21 20:34:21 +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
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
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
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
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
49e7f7564a renamed various things for clarity
svn-id: r7754
2003-05-20 20:58:26 +00:00
Max Horn
3e3d6f1360 renamed o2_matrixOps -> o2_setBoxFlags; V2 'objY' fixes; cleanup
svn-id: r7739
2003-05-20 16:13:34 +00:00
Max Horn
cf500b2450 enable box'ed walking in V2 games
svn-id: r7660
2003-05-19 00:25:26 +00:00
Max Horn
b43bca21cb more cleanup
svn-id: r7653
2003-05-18 23:46:30 +00:00
Max Horn
657c8ca2e3 more V2 sentence cleanup
svn-id: r7631
2003-05-18 12:52:27 +00:00
Max Horn
a38c3599ce fixed opcode 0x47
svn-id: r7630
2003-05-18 12:02:17 +00:00
Max Horn
30271732be some sentence fixes
svn-id: r7612
2003-05-17 18:30:47 +00:00
James Brown
6db28696e4 Fix invalid variable
svn-id: r7599
2003-05-17 06:18:34 +00:00
James Brown
99b26a5684 Name some vars
svn-id: r7597
2003-05-17 06:04:22 +00:00
Max Horn
3a145f50e7 disable assert in o2_putActor for now (is triggered in Zak intro); cleanup
svn-id: r7592
2003-05-17 01:01:05 +00:00
Max Horn
92a71eed10 fixed o2_drawObject (thx MadMoose)
svn-id: r7586
2003-05-16 23:50:56 +00:00
Max Horn
64d9c75c2d cleanup
svn-id: r7583
2003-05-16 22:11:49 +00:00
James Brown
914d886769 test stuff
svn-id: r7573
2003-05-16 12:58:49 +00:00
Max Horn
9f272a2acf fixed o2_getActorX / o2_getActorY (thanks MadMoose)
svn-id: r7564
2003-05-16 02:33:08 +00:00
Max Horn
7d08aea4cc SentenceTab unk4/unk3 are the sentence objects (think of: 'Use objectA with objectB' or 'Give objectA to objectB' etc.); added a little more V2 sentence hackery; added a FIXME regarding some strange sentence code (accessing objectB before it is set) in script.cpp
svn-id: r7562
2003-05-16 02:16:59 +00:00
Max Horn
e1652fedea hackish partial doSentence support
svn-id: r7560
2003-05-16 01:56:06 +00:00
Max Horn
f495c14d84 opcodes are just one byte
svn-id: r7513
2003-05-14 20:37:53 +00:00
Max Horn
d7352e8e19 fixed V2 decodeParseString
svn-id: r7508
2003-05-14 14:22:15 +00:00
Max Horn
a4915a3304 default text color light blue instead of pink
svn-id: r7506
2003-05-14 14:00:29 +00:00
Max Horn
45b2698b24 cleanup
svn-id: r7503
2003-05-14 13:32:43 +00:00
Max Horn
bc99915aa5 V2 text drawing
svn-id: r7502
2003-05-14 13:30:52 +00:00
Jonathan Gray
50a857a406 make gcc with extra extra warnings happy
svn-id: r7501
2003-05-14 12:32:40 +00:00
Max Horn
d8048837f3 fixed v2 verb handling
svn-id: r7500
2003-05-14 12:26:23 +00:00
Max Horn
08f7ec192e NUM_ACTORS -> _numActors (for consistency)
svn-id: r7489
2003-05-13 23:42:41 +00:00