diff options
author | Tobias Gunkel | 2012-01-03 22:10:50 +0100 |
---|---|---|
committer | Tobias Gunkel | 2012-02-11 08:02:32 +0100 |
commit | a79f224c23f1b0fa4d9850a032e0adc0d72619f7 (patch) | |
tree | 16a2614e1220fb1f97fefa8820cd78708f11749f /common/winexe_pe.h | |
parent | c9ae5f383807c1f40088fc042d470bf8ba74f1da (diff) | |
download | scummvm-rg350-a79f224c23f1b0fa4d9850a032e0adc0d72619f7.tar.gz scummvm-rg350-a79f224c23f1b0fa4d9850a032e0adc0d72619f7.tar.bz2 scummvm-rg350-a79f224c23f1b0fa4d9850a032e0adc0d72619f7.zip |
SCUMM: changed handling of _activeInventory/_activeActor to _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()
Diffstat (limited to 'common/winexe_pe.h')
0 files changed, 0 insertions, 0 deletions