thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DREAMWEB: Rename a member of SetObject & DynObject to objId

Browse source 
SetObject::name and DynObject::id are stored at the exact same offset,
and have the exact same meaning (see also objectMatches()). Now they
also have the same name, objId.
This commit is contained in:
Max Horn 2011-12-28 16:21:30 +01:00
parent c10ea611e8
commit ca7da4cffc
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/dreamweb/object.cpp
View file

@ -57,7 +57,7 @@ void DreamWebEngine::fillRyan() {
}
bool DreamWebEngine::isItWorn(const DynObject *object) {
return (object->id[0] == 'W'-'A') && (object->id[1] == 'E'-'A');
return (object->objId[0] == 'W'-'A') && (object->objId[1] == 'E'-'A');
}
void DreamWebEngine::wornError() {
@ -74,8 +74,8 @@ void DreamWebEngine::wornError() {
}
void DreamWebEngine::makeWorn(DynObject *object) {
object->id[0] = 'W'-'A';
object->id[1] = 'E'-'A';
object->objId[0] = 'W'-'A';
object->objId[1] = 'E'-'A';
}
void DreamWebEngine::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {