From ca7da4cffc7edacd90df408c441a6eca10cc0e55 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 16:21:30 +0100
Subject: DREAMWEB: Rename a member of SetObject & DynObject to objId

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.
---
 engines/dreamweb/object.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/dreamweb/object.cpp')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 8e6436c100..8d4f9bf84a 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -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) {
-- 
cgit v1.2.3