Commit graph

107 commits

Author SHA1 Message Date
Max Horn
5202a59c63 some setObjectName changes. I'd really like to switch V2-V5 to use rtObjectName resources, too
svn-id: r8171
2003-05-31 12:17:58 +00:00
Max Horn
877ca1b859 Workaround for bug #746349
svn-id: r8157
2003-05-30 22:22:51 +00:00
Max Horn
238e759630 modified o5_getClosestObjActor to find actors/objects more than 255 pixels away
svn-id: r8143
2003-05-30 14:33:05 +00:00
Max Horn
691e1f390a rewrote Actor::needBgReset related code (this could cause regressions...)
svn-id: r8126
2003-05-30 00:55:21 +00:00
Max Horn
6ec53131aa work around bug #743615
svn-id: r8006
2003-05-26 14:43:02 +00:00
Max Horn
07df5bd181 cleanup / minor tweak
svn-id: r7890
2003-05-24 16:11:47 +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
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
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
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
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
c78664cbc9 renamed talkFrame1/talkFrame2 to talkStartFrame/talkStopFrame
svn-id: r7819
2003-05-22 09:58:33 +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
Max Horn
8a82e59065 constness fixes
svn-id: r7787
2003-05-21 16:28:02 +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
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
3e3d6f1360 renamed o2_matrixOps -> o2_setBoxFlags; V2 'objY' fixes; cleanup
svn-id: r7739
2003-05-20 16:13:34 +00:00
Jamieson Christian
5a89820f0d Fixed VC++ warnings
svn-id: r7690
2003-05-19 15:40:34 +00:00
Max Horn
18a6b5dcc1 renamed ScriptSlot::unk1/unk2 to freezeResistant/recursive
svn-id: r7688
2003-05-19 11:31:35 +00:00
Max Horn
5ac005860c warning() automatically outputs a newline after the warning message; adding a newline into the format string adds another newline (which contains the single char '!')
svn-id: r7647
2003-05-18 21:14:50 +00:00
Max Horn
1156abd532 wow, now this is a stupid bug... fixes various issues in Zak256 at the very least
svn-id: r7622
2003-05-18 02:22:26 +00:00
Oliver Kiehl
740d1150f5 make gcc 3.3 happy. a->scalex and a->scaley are of type char and cannot be greater 255
svn-id: r7619
2003-05-17 23:46:03 +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
5e756aa8b8 cleanup
svn-id: r7550
2003-05-15 22:48:06 +00:00
Max Horn
cc8da4538d added comment
svn-id: r7535
2003-05-15 20:47:31 +00:00
Max Horn
f495c14d84 opcodes are just one byte
svn-id: r7513
2003-05-14 20:37:53 +00:00
Max Horn
08f7ec192e NUM_ACTORS -> _numActors (for consistency)
svn-id: r7489
2003-05-13 23:42:41 +00:00
Max Horn
0ee0e7f634 cleanup
svn-id: r7488
2003-05-13 23:33:01 +00:00
Max Horn
acb35fc915 renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive)
svn-id: r7423
2003-05-10 21:49:59 +00:00
Max Horn
98881c3a6a init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning
svn-id: r7393
2003-05-08 15:48:50 +00:00
Max Horn
07bbeb31e9 fixed o2_resourceRoutines
svn-id: r7391
2003-05-08 14:14:37 +00:00
Max Horn
f0f955ab15 experimental fix for Zak256 (see bug #733964)
svn-id: r7387
2003-05-08 00:28:05 +00:00
Max Horn
e6c8c46291 fixed bug #734057
svn-id: r7386
2003-05-07 23:09:04 +00:00
Max Horn
b1145090f6 Patch #733099: DIG: Experimental camera fix (should fix bugs #716350 and #659158)
svn-id: r7384
2003-05-07 22:56:06 +00:00
Max Horn
ac0897515d unified o?_isEqual, too (but not as nice due to hack)
svn-id: r7340
2003-05-05 09:25:07 +00:00
Max Horn
fa0df19a1d cleanup / reduced code duplication
svn-id: r7339
2003-05-05 09:19:15 +00:00
Jonathan Gray
7a10ab0cc2 remove hack that should not have been there in the first place...
svn-id: r7321
2003-05-04 14:06:30 +00:00
Max Horn
5c3046ae98 erik's fix for the airplane bug in Indy3
svn-id: r7318
2003-05-04 13:50:28 +00:00
Max Horn
a8c180ddf8 cleanup
svn-id: r7314
2003-05-04 13:00:41 +00:00
Max Horn
3b77249ab0 cleanup; got rid of o2_printEgo
svn-id: r7300
2003-05-04 01:10:45 +00:00
Max Horn
0ce5658d66 o5_dummy -> o2_dummy (it's not used by the V5 code at all...)
svn-id: r7297
2003-05-04 00:29:52 +00:00
Max Horn
9466a5dcef Patch #730800: EGA LOOM: Hack to fix palette problem (also helps MonkeyEGA)
svn-id: r7290
2003-05-03 20:49:53 +00:00
Max Horn
7e58986519 only moved stuff (to group sound related stuff)
svn-id: r7288
2003-05-03 17:50:04 +00:00
James Brown
1038caae58 Remove some test stuff
svn-id: r7278
2003-05-03 07:29:44 +00:00
James Brown
ffdeb38b80 Fix assert with hack return. Need to fix these !a things properly one day.
svn-id: r7277
2003-05-03 07:23:53 +00:00
Jonathan Gray
fb36c0ad30 off by one error
svn-id: r7248
2003-05-01 13:45:45 +00:00