Commit Graph

94 Commits

Author SHA1 Message Date
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
Max Horn
c739960176 added yet another sanity check (assert); fixed long standing evil bug in getObjNewDir / getObjOldDir
svn-id: r6763
2003-03-08 00:56:43 +00:00
Max Horn
20c6cfdd2d some more dummy code for valgrind debugging
svn-id: r6762
2003-03-08 00:24:23 +00:00
Paweł Kołodziejski
aa3766018f updated copyrights headers
svn-id: r6726
2003-03-06 21:46:56 +00:00
Paweł Kołodziejski
093428ae9a and more cleanup
svn-id: r6718
2003-03-06 17:58:13 +00:00
Max Horn
45f6976805 Patch #697848: Small removeObjectFromRoom() cleanup
svn-id: r6689
2003-03-05 11:39:27 +00:00
Max Horn
f6bac973f8 patch #696030: CMI: More actor direction fixes
svn-id: r6662
2003-03-02 15:51:56 +00:00
Paweł Kołodziejski
d115e0ad75 fixed warnings
svn-id: r6659
2003-03-02 12:36:07 +00:00
Jonathan Gray
18acc2e800 patch #693475 attempt to address the actor facing problems in comi by erik
svn-id: r6643
2003-02-27 10:42:12 +00:00
James Brown
d1eb2636f4 Patch 671031: Fix for MI1 intro crash + others (move new object
clearing code into a more generic function, and call it earlier)

svn-id: r6548
2003-01-26 10:57:01 +00:00
Paweł Kołodziejski
3faa561c47 fix compilation under VC6
svn-id: r6495
2003-01-18 14:16:55 +00:00
James Brown
2810185599 Clip strip value when removing objects
svn-id: r6488
2003-01-17 15:23:27 +00:00
Max Horn
8ad002b3a3 first blastText version. this is work in progress (note that e.g. text is not clipped, and the extra information is not removed)
svn-id: r6472
2003-01-16 00:40:19 +00:00
James Brown
5bf741f960 Patch 667613: Extend gfxUsageBits[]
svn-id: r6453
2003-01-14 10:06:56 +00:00
Max Horn
62780b34d7 clear object table for small header games, too
svn-id: r6448
2003-01-13 16:00:19 +00:00
Max Horn
d900d280c0 fixed checkRange output; added checkRange call to drawObject; cleanup
svn-id: r6447
2003-01-13 15:27:06 +00:00
Max Horn
0a3bc7d36f removed obsolete FIXME
svn-id: r6446
2003-01-13 15:13:24 +00:00
Max Horn
6fada952c0 indention fix
svn-id: r6445
2003-01-13 15:06:58 +00:00
Max Horn
1f88542417 don't lock/unlock if resource was already locked
svn-id: r6439
2003-01-12 21:53:25 +00:00
Max Horn
454fc651c0 fix beach crash in COMI
svn-id: r6438
2003-01-12 21:46:58 +00:00
Max Horn
aa60f424ba fix banjo duel crash
svn-id: r6427
2003-01-12 13:58:16 +00:00
Max Horn
0305a2ba0a dump flObject scripts, too
svn-id: r6424
2003-01-12 13:06:59 +00:00
James Brown
37648803ae Remove the second biggest hack I've ever seen
svn-id: r6423
2003-01-12 10:33:30 +00:00
James Brown
a4af93c22c End of flObject rewrite. It works! It works! :P
svn-id: r6421
2003-01-12 10:20:09 +00:00
James Brown
ea9d3dd9bb Fhew. Fix crash.
svn-id: r6418
2003-01-12 08:37:59 +00:00
James Brown
daa5397e02 Small fix - _numLocalObjects is a 1-based array, so don't go reading bad memory :P
svn-id: r6417
2003-01-12 08:32:44 +00:00