119 Commits

Author SHA1 Message Date
Max Horn
86df3537b9 replaced GF_AFTER with _version
svn-id: r8372
2003-06-07 00:13:26 +00:00
Jonathan Gray
620762b466 v1 object drawing updates from aquadran
svn-id: r8346
2003-06-06 07:35:19 +00:00
Paweł Kołodziejski
00288b07f8 fixed almost object drawing for v1 games, (ugly hack for drawBitmap)
svn-id: r8345
2003-06-06 05:27:45 +00:00
Torbjörn Andersson
7cfe07fdd3 Reverted the recent o5_getClosestObjActor() change and fixed it by
measuring the distance in characters for V2 games instead. Now Edna won't
bring the same strange kid into the cell over and over again.

If necessary, we can still fix o5_getClosestActor() to handle larger
distances. It just takes a few more changes than I first thought.

svn-id: r8243
2003-06-01 16:40:15 +00:00
Max Horn
9cbcde684b cleanup / added comments / code unification
svn-id: r8235
2003-06-01 13:09:30 +00:00
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
d5d0440e8c cleanup
svn-id: r8169
2003-05-31 11:57:18 +00:00
Max Horn
eb039ec554 some cheap doxygen docs; cleanup
svn-id: r8154
2003-05-30 20:13:29 +00:00
Max Horn
c6b35e15a0 moved bomp stuff into own files; removed some of our 6 (!) bomp decoders
svn-id: r8151
2003-05-30 19:00:33 +00:00
Max Horn
3d28cfaf82 cleanup
svn-id: r8145
2003-05-30 15:06:29 +00:00
Max Horn
5557ec719e work around nexus crash (only in old savegames?)
svn-id: r8123
2003-05-30 00:40:58 +00:00
Max Horn
1f70da0155 const as const can!
svn-id: r8058
2003-05-28 20:01:47 +00:00
Max Horn
c5dbd8355f cleanup
svn-id: r8007
2003-05-26 14:44:03 +00:00
Max Horn
ac3f871910 some more debug output
svn-id: r7888
2003-05-24 16:02:07 +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
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
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
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
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
a2ce5b6383 don't touch untouchable objects in V2 games
svn-id: r7664
2003-05-19 01:27:30 +00:00
Max Horn
7171c5bcd4 cleanup
svn-id: r7646
2003-05-18 21:03:57 +00:00
Max Horn
56d6443b19 fixed object walk_x/walk_y for V2 games
svn-id: r7591
2003-05-17 00:59:47 +00:00
Max Horn
a455082996 added roomobj dumping for bundle games (was trivial it turns out :-)
svn-id: r7581
2003-05-16 21:31:15 +00:00
Max Horn
c1c9510ae8 fixed the evil, evil COMI crash on Mac OS X (and memory corrupter elsewhere, maybe?). The last part of this change is the crucial one, computing the correct value for right_strip
svn-id: r7527
2003-05-15 17:57:52 +00:00
Max Horn
f3a5fc79c1 bounds check; made data static
svn-id: r7519
2003-05-15 00:03:49 +00:00
Max Horn
08f7ec192e NUM_ACTORS -> _numActors (for consistency)
svn-id: r7489
2003-05-13 23:42:41 +00:00
Max Horn
f412952667 fixed object drawing state handling for V2 games (this shouldn't cause any regressions in newer games)
svn-id: r7424
2003-05-10 22:12:23 +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
6bf0b6cb0d fixed script dumping for flobject script in V6/V7 games
svn-id: r7419
2003-05-10 18:38:59 +00:00
Max Horn
114af3159e added a 'width' parameter to drawBitmap (contrary to 'numstrips', it specifies the full width of the image passed in, not how much we shoul draw of it) - this will be used for the new V2 drawBitmap code; renamed drawBitmap parameter 'h' to 'height'
svn-id: r7412
2003-05-10 12:59:32 +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
8700fa5ff6 fixed roomobj dumping
svn-id: r7316
2003-05-04 13:09:42 +00:00
Max Horn
5095cd3860 fixed regression in MonkeyVGA <sigh>. Aquadran, is the 16 right even for GF_OLD_BUNDLE ? Or should it just always be 1?
svn-id: r7252
2003-05-01 16:05:47 +00:00
Max Horn
c9f80db201 ooops, seems the 1 -> 16 changed caused a regression in Zak256 (and I bet in Indy3VGA, too). Reverting this change partially. If anybody experiences problem selecting certain objects in other GF_SMALL_HEADER, tell me
svn-id: r7186
2003-04-28 18:28:43 +00:00
Paweł Kołodziejski
850ee739af fixed two offsets for V2 and two warnings
svn-id: r7185
2003-04-28 18:19:48 +00:00
Max Horn
a1a8c3ed05 cleanup (yes, the parentstate was changed from 1 to 16 for V3/V4 games - but that actually seems to be correct, according to older comments in this file, and the disassmbly)
svn-id: r7175
2003-04-28 12:38:24 +00:00
Paweł Kołodziejski
64e5240efd fixed offsets for object names for scumm v2
svn-id: r7142
2003-04-26 16:56:59 +00:00
Max Horn
adbd60cc7b fixed object names in Indy3EGA and Loom
svn-id: r7139
2003-04-26 16:45:23 +00:00
Paweł Kołodziejski
6bd3454ae5 update for scumm v2
svn-id: r7137
2003-04-26 16:37:35 +00:00
Max Horn
2d8fa42f44 renamed setCursorHotspot2 to setCursorHotspot; fixed (with a hack) cursor in Loom
svn-id: r7132
2003-04-26 13:28:34 +00:00
Paweł Kołodziejski
48ad5199ff fixes for v3 broken by v2
svn-id: r7057
2003-04-21 13:10:58 +00:00
Paweł Kołodziejski
d9adc5d71a changes for v2 resources
svn-id: r7053
2003-04-21 11:19:56 +00:00
Paweł Kołodziejski
a114ddbbf7 shouldn't be increased to next search object ?
svn-id: r7009
2003-04-13 21:47:48 +00:00
Paweł Kołodziejski
e0d170faca handle old_bundle offsets getVerbEntrypoint(), o5_setObjectName(), getObjOrActorName() funcs
svn-id: r7003
2003-04-13 16:42:33 +00:00
Paweł Kołodziejski
aff192d554 handle old_bundle size at addObjectToInventory() func
svn-id: r7002
2003-04-13 16:21:41 +00:00
Max Horn
fc08a317b0 fixed OLD_BUNDLE object image offset
svn-id: r6991
2003-04-12 18:43:23 +00:00
Max Horn
3fcac728a8 added GF_OLD_BUNDLE to findObjectInRoom
svn-id: r6986
2003-04-12 12:58:20 +00:00
Max Horn
9750a2407c lots of unblocked aka GF_OLD_BUNDLE support code (still no load, but gets further :-)
svn-id: r6977
2003-04-12 02:09:00 +00:00