aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/object.h
AgeCommit message (Collapse)Author
2012-02-11SCUMM: adjust to coding style-guideTobias Gunkel
2012-02-11SCUMM: merge object v0 id and type into one object varTobias Gunkel
2012-02-11SCUMM: fix debugger for v0Tobias Gunkel
2012-02-11SCUMM: start handling object type and id correctly in mm c64Tobias Gunkel
- removed complicated and unnecessary _v0ObjectIndex, _v0ObjectInInventory, _v0ObjectFlag vars - started to merge object id and type into one object value (type<<8|id) - verb preposition ids do not dependent on language -> remove from VerbSettings Note: - objects with type=0 are foreground objects. They have a state, an owner and a bg overlay image. - objects with type=1 are bg objects. They do not have a state or owner and are already contained in the bg image. The do not have an entry in objectState/OwnerTable
2012-02-11SCUMM: changed handling of _activeInventory/_activeActor to ↵Tobias Gunkel
_activeObject(2)/_activeObject(2)Type Note: the transition is not completed yet. The code compiles but is probably not runnable as not every occurrence of _activeInventory has been properly replaced. The usage of _v0ObjectIndex and _v0ObjectInInventory should be revised too and both variables should be replaced by another mechanism (maybe by using a single variable "obj = (type << 8) | id"). - moved v0 only vars _activeInventory, _activeObject, _activeVerb from ScummEngine_v2 to ScummEngine_v0 - removed _activeActor, _activeInvExecute, _activeObject2Inv and _activeInventory. They are handled by _activeObject/_activeObjectType and _activeObject2/_activeObject2Type now. - removed _activeObject(2)Index as they only bloat the code without any benefit (?) - merge prep-name tables from ScummEngine_v2::drawPreposition() and ScummEngine_v0::drawSentenceWord() by introducing ScummEngine_v2::drawPreposition() - rename ObjectData.flags -> obj_type (quick-fix only, needs review! Maybe obj_nr and obj_type can be merged into one var: obj_nr = (obj_type << 8) | obj_nr) - o_unknown2 is negation of o_ifActiveObject (o_ifNotEqualActiveObject2) - renamed o_ifActiveObject -> o_ifEqualActiveObject2 as it acts only on _activeObject2 - renamed ScummEngine_v0::drawSentenceWord() -> ScummEngine_v0::getObjectName()
2011-05-12GIT: Clean up: Suppress SVN tags, now uselessstrangerke
2008-01-27Removed trailing spaces.Jordi Vilalta Prat
svn-id: r30664
2007-07-01Re-added __attribute__(packed)Max Horn
svn-id: r27830
2007-05-30Updated legal headers in source files, based on what Pidgin (the IM client ↵Max Horn
formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots svn-id: r27024
2007-02-19Use consistent naming for the preprocessor constants used to guarantee thatTorbjörn Andersson
header files are only included once. Many of them didn't have a SCUMM prefix which could have lead to clashes with common header files. svn-id: r25727
2006-10-29Named / documented the V0-V2 object states (we should probably rename the ↵Max Horn
corresponding opcodes here and in descumm to make reading script dumps easier) svn-id: r24566
2006-07-23Use #include "..." instead of #include <...> for pack-start.h and pack-end.hTorbjörn Andersson
for consistency with other #includes. svn-id: r23585
2006-07-22Fix struct packing issues (macros are not resolve in #pragma params, at ↵Max Horn
least for GCC) svn-id: r23569
2006-07-21Removing GCC_PACK, we fully rely on START_PACK_STRUCTS / END_PACK_STRUCTS ↵Max Horn
now (hiya eriktorbjorn, this one is for you *ggg*) svn-id: r23547
2006-07-09Use START_PACK_STRUCTS / END_PACK_STRUCTS when available, instead of ↵Max Horn
checking for GCC / not GCC svn-id: r23458
2006-02-11Moved engines to the new engines/ directoryMax Horn
svn-id: r20582