aboutsummaryrefslogtreecommitdiff
path: root/scumm/object.cpp
AgeCommit message (Collapse)Author
2003-07-24cleanup: encapsulate some more members of class Actor, and rename ↵Max Horn
newDirection -> targetFacing (since it corresponds to the future value of 'facing'; the distinction between 'facing' and 'direction' is extremly fuzzy) svn-id: r9175
2003-06-30this FIXME is obsoleted by my recent fix for getMaskFromBoxMax Horn
svn-id: r8678
2003-06-27fixed warningPaweł Kołodziejski
svn-id: r8664
2003-06-26paranoia fix for getOBCDFromObject, in casegetResourceAddress returns 0Max Horn
svn-id: r8653
2003-06-26added getOBIMFromObject and getObjectImage methods; changed code to use thoseMax Horn
svn-id: r8651
2003-06-26added ResourceIterator, replacing two of the old ↵Max Horn
findResource/findResourceSmall function - contraty to those, this approach is thread safe svn-id: r8650
2003-06-25added some const qualifiers; moved _bundle & _current_cd_sound from class ↵Max Horn
Scumm to class Sound; some other tweaks svn-id: r8648
2003-06-20seems monkeyega & monkeyvga have byte values for the object name offset, tooMax Horn
svn-id: r8571
2003-06-20fixed Zak256 (and possibly other V3 games); Not quite sure if the behaviour ↵Max Horn
is correct for V4 games, that needs testing svn-id: r8568
2003-06-19instead of casting to byte, rather allow offsets > 255Max Horn
svn-id: r8564
2003-06-18Fixed MSVC warningsJamieson Christian
svn-id: r8544
2003-06-16Bypass the Maniac Mansion copy protection by making the security door stayTorbjörn Andersson
open at all times, like some original versions did. This still leaves the player the option of blowing the mansion up by entering the wrong code. I still don't know if it has any unforseen side-effects. svn-id: r8517
2003-06-14Patch #754151: Removed READ_*_UNALIGNED and always read stuff bytewise; ↵Max Horn
augmented by some more changes of mine svn-id: r8482
2003-06-14runHook -> runInventoryScript, VAR_HOOK_SCRIPT -> VAR_INVENTORY_SCRIPTMax Horn
svn-id: r8468
2003-06-14Format string/argument mismatch fix.Torbjörn Andersson
svn-id: r8464
2003-06-07replaced GF_AFTER with _versionMax Horn
svn-id: r8372
2003-06-06v1 object drawing updates from aquadranJonathan Gray
svn-id: r8346
2003-06-06fixed almost object drawing for v1 games, (ugly hack for drawBitmap)Paweł Kołodziejski
svn-id: r8345
2003-06-01Reverted the recent o5_getClosestObjActor() change and fixed it byTorbjörn Andersson
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-01cleanup / added comments / code unificationMax Horn
svn-id: r8235
2003-05-31some setObjectName changes. I'd really like to switch V2-V5 to use ↵Max Horn
rtObjectName resources, too svn-id: r8171
2003-05-31cleanupMax Horn
svn-id: r8169
2003-05-30some cheap doxygen docs; cleanupMax Horn
svn-id: r8154
2003-05-30moved bomp stuff into own files; removed some of our 6 (!) bomp decodersMax Horn
svn-id: r8151
2003-05-30cleanupMax Horn
svn-id: r8145
2003-05-30work around nexus crash (only in old savegames?)Max Horn
svn-id: r8123
2003-05-28const as const can!Max Horn
svn-id: r8058
2003-05-26cleanupMax Horn
svn-id: r8007
2003-05-24some more debug outputMax Horn
svn-id: r7888
2003-05-23replaced many unsafe uses of derefActorSafe by derefActor; replaced ↵Max Horn
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-22not needed anymore since we read the preposition flag directly from the obcd ↵Max Horn
data again svn-id: r7830
2003-05-22restricted getObjectIndex to only search thru _objs, not _inventory(to avoid ↵Max Horn
future confusion), this might cause regressions, though; fixed o2_getObjPreposition; adapted some code to the changed getObjectIndex svn-id: r7829
2003-05-21many pedantic warning fixes (and some actual potential buglets fixed, too)Max Horn
svn-id: r7795
2003-05-20added enum's for the known actor/object claasses; extended putClass/getClass ↵Max Horn
to translate the X/Y flip classes; made code use the new enum's; some other cleanup svn-id: r7753
2003-05-20got rid of the evil locked-box hack in adjustXYToBeInBox; instead check for ↵Max Horn
locked boxes in walkActorOld, which seems to work just as well (and hopefully better) svn-id: r7750
2003-05-20renamed o2_matrixOps -> o2_setBoxFlags; V2 'objY' fixes; cleanupMax Horn
svn-id: r7739
2003-05-19don't touch untouchable objects in V2 gamesMax Horn
svn-id: r7664
2003-05-18cleanupMax Horn
svn-id: r7646
2003-05-17fixed object walk_x/walk_y for V2 gamesMax Horn
svn-id: r7591
2003-05-16added roomobj dumping for bundle games (was trivial it turns out :-)Max Horn
svn-id: r7581
2003-05-15fixed the evil, evil COMI crash on Mac OS X (and memory corrupter elsewhere, ↵Max Horn
maybe?). The last part of this change is the crucial one, computing the correct value for right_strip svn-id: r7527
2003-05-15bounds check; made data staticMax Horn
svn-id: r7519
2003-05-13NUM_ACTORS -> _numActors (for consistency)Max Horn
svn-id: r7489
2003-05-10fixed object drawing state handling for V2 games (this shouldn't cause any ↵Max Horn
regressions in newer games) svn-id: r7424
2003-05-10renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and ↵Max Horn
_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-10fixed script dumping for flobject script in V6/V7 gamesMax Horn
svn-id: r7419
2003-05-10added a 'width' parameter to drawBitmap (contrary to 'numstrips', it ↵Max Horn
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-08init all VAR_* variables to 0xFF; replaced access to _vars in the form ↵Max Horn
_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-04fixed roomobj dumpingMax Horn
svn-id: r7316
2003-05-01fixed regression in MonkeyVGA <sigh>. Aquadran, is the 16 right even for ↵Max Horn
GF_OLD_BUNDLE ? Or should it just always be 1? svn-id: r7252