189 Commits

Author SHA1 Message Date
Max Horn
b8e943a67e cleanup
svn-id: r8056
2003-05-28 19:54:46 +00:00
Max Horn
8d4b2bbf73 fixed o2_waitForSentence
svn-id: r8047
2003-05-28 13:28:43 +00:00
Max Horn
29a25f66f2 italian V2 prepositions
svn-id: r8039
2003-05-27 23:28:41 +00:00
Max Horn
80eab4c3c4 hook language command switch to V2 font / prepositions
svn-id: r7970
2003-05-25 20:38:44 +00:00
Max Horn
30d9dde76c preparations for multi-language V2 supports
svn-id: r7966
2003-05-25 18:56:20 +00:00
Max Horn
9d95b025cd fixed roomOps:1 (thanks to Hoenicke)
svn-id: r7894
2003-05-24 17:18: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
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
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
James Brown
73c6cf8bc9 Patch #742132: o2_setobjectname script overwrite fix
svn-id: r7854
2003-05-23 06:35:47 +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
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
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