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

2
engines/dreamweb/monitor.cpp
View file

@ -400,7 +400,7 @@ void DreamWebEngine::loadCart() {
uint16 objectIndex = findSetObject("INTF"); uint16 objectIndex = findSetObject("INTF");
uint16 cartridgeIndex = checkInside(objectIndex, 1); uint16 cartridgeIndex = checkInside(objectIndex, 1);
if (cartridgeIndex != kNumexobjects) if (cartridgeIndex != kNumexobjects)
cartridgeId = getExAd(cartridgeIndex)->id[3] + 1; cartridgeId = getExAd(cartridgeIndex)->objId[3] + 1;
if (cartridgeId == 0) if (cartridgeId == 0)
loadTextFile(_textFile3, "DREAMWEB.T20"); // monitor file 20 loadTextFile(_textFile3, "DREAMWEB.T20"); // monitor file 20

6
engines/dreamweb/object.cpp
View file

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

4
engines/dreamweb/structs.h
View file

@ -71,7 +71,7 @@ struct SetObject {
uint8 b9; uint8 b9;
uint8 b10; uint8 b10;
uint8 b11; uint8 b11;
uint8 name[4]; uint8 objId[4];
uint8 b16; uint8 b16;
uint8 index; uint8 index;
uint8 frames[13]; // Table mapping animFrame to sprite frame number uint8 frames[13]; // Table mapping animFrame to sprite frame number
@ -116,7 +116,7 @@ struct DynObject {
uint8 objectSize; // the size of an object uint8 objectSize; // the size of an object
uint8 turnedOn; uint8 turnedOn;
uint8 initialLocation; uint8 initialLocation;
uint8 id[4]; uint8 objId[4];
}; };
struct ObjPos { struct ObjPos {

4
engines/dreamweb/stubs.cpp
View file

@ -3696,7 +3696,7 @@ void DreamWebEngine::purgeAnItem() {
const DynObject *extraObjects = _exData; const DynObject *extraObjects = _exData;
for (size_t i = 0; i < kNumexobjects; ++i) { for (size_t i = 0; i < kNumexobjects; ++i) {
if (extraObjects[i].mapad[0] && extraObjects[i].id[0] == 255 && if (extraObjects[i].mapad[0] && extraObjects[i].objId[0] == 255 &&
extraObjects[i].initialLocation != _realLocation) { extraObjects[i].initialLocation != _realLocation) {
deleteExObject(i); deleteExObject(i);
return; return;
@ -3704,7 +3704,7 @@ void DreamWebEngine::purgeAnItem() {
} }
for (size_t i = 0; i < kNumexobjects; ++i) { for (size_t i = 0; i < kNumexobjects; ++i) {
if (extraObjects[i].mapad[0] && extraObjects[i].id[0] == 255) { if (extraObjects[i].mapad[0] && extraObjects[i].objId[0] == 255) {
deleteExObject(i); deleteExObject(i);
return; return;
} }

6
engines/dreamweb/use.cpp
View file

@ -1396,7 +1396,7 @@ void DreamWebEngine::usePipe() {
showPuzText(36, 300); showPuzText(36, 300);
putBackObStuff(); putBackObStuff();
DynObject *exObject = getExAd(_withObject); DynObject *exObject = getExAd(_withObject);
exObject->id[3] = 'F'-'A'; // CUPE (empty cup) -> CUPF (full cup) exObject->objId[3] = 'F'-'A'; // CUPE (empty cup) -> CUPF (full cup)
return; return;
} else if (compare(_withObject, _withType, "CUPF")) { } else if (compare(_withObject, _withType, "CUPF")) {
// Already full // Already full
@ -1419,7 +1419,7 @@ void DreamWebEngine::useOpenBox() {
_vars._progressPoints++; _vars._progressPoints++;
showPuzText(37, 300); showPuzText(37, 300);
DynObject *exObject = getExAd(_withObject); DynObject *exObject = getExAd(_withObject);
exObject->id[3] = 'E'-'A'; // CUPF (full cup) -> CUPE (empty cup) exObject->objId[3] = 'E'-'A'; // CUPF (full cup) -> CUPE (empty cup)
_vars._watchingTime = 140; _vars._watchingTime = 140;
_vars._reelToWatch = 105; _vars._reelToWatch = 105;
_vars._endWatchReel = 181; _vars._endWatchReel = 181;
@ -1449,7 +1449,7 @@ void DreamWebEngine::runTap() {
if (compare(_withObject, _withType, "CUPE")) { if (compare(_withObject, _withType, "CUPE")) {
// Fill cup from tap // Fill cup from tap
DynObject *exObject = getExAd(_withObject); DynObject *exObject = getExAd(_withObject);
exObject->id[3] = 'F'-'A'; // CUPE (empty cup) -> CUPF (full cup) exObject->objId[3] = 'F'-'A'; // CUPE (empty cup) -> CUPF (full cup)
playChannel1(8); playChannel1(8);
showPuzText(57, 300); showPuzText(57, 300);
putBackObStuff(); putBackObStuff();