From c10ea611e8058958a606ff4478871e7909d882d9 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 15:55:47 +0100
Subject: DREAMWEB: Rename getEitherAdCPP to getEitherAd, use obj type enums

---
 engines/dreamweb/dreamweb.h |  2 +-
 engines/dreamweb/object.cpp | 34 +++++++++++++++++-----------------
 engines/dreamweb/stubs.cpp  |  6 +++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index b7713352ff..2031e759cc 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -797,7 +797,7 @@ public:
 	void findOrMake(uint8 index, uint8 value, uint8 type);
 	DynObject *getFreeAd(uint8 index);
 	DynObject *getExAd(uint8 index);
-	DynObject *getEitherAdCPP();
+	DynObject *getEitherAd();
 	void *getAnyAdDir(uint8 index, uint8 flag);
 	void showWatch();
 	void showTime();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index a9cbadcc2c..8e6436c100 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -105,9 +105,9 @@ void DreamWebEngine::obPicture() {
 }
 
 void DreamWebEngine::obIcons() {
-	uint8 value1, value2;
-	getAnyAd(&value1, &value2);
-	if (value1 != 0xff) {
+	uint8 slotSize, slotCount;
+	getAnyAd(&slotSize, &slotCount);
+	if (slotSize != 0xff) {
 		// can open it
 		showFrame(_icons2, 210, 1, 4, 0);
 	}
@@ -270,9 +270,9 @@ void DreamWebEngine::getBackFromOb() {
 byte DreamWebEngine::getOpenedSlotCount() {
 	byte obj = _openedOb;
 	switch (_openedType) {
-	case 4:
+	case kExObjectType:
 		return getExAd(obj)->slotCount;
-	case 2:
+	case kFreeObjectType:
 		return getFreeAd(obj)->slotCount;
 	default:
 		return getSetAd(obj)->slotCount;
@@ -282,9 +282,9 @@ byte DreamWebEngine::getOpenedSlotCount() {
 byte DreamWebEngine::getOpenedSlotSize() {
 	byte obj = _openedOb;
 	switch (_openedType) {
-	case 4:
+	case kExObjectType:
 		return getExAd(obj)->slotSize;
-	case 2:
+	case kFreeObjectType:
 		return getFreeAd(obj)->slotSize;
 	default:
 		return getSetAd(obj)->slotSize;
@@ -669,7 +669,7 @@ void DreamWebEngine::dropObject() {
 	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
-	if (isItWorn(getEitherAdCPP())) {
+	if (isItWorn(getEitherAd())) {
 		wornError();
 		return;
 	}
@@ -711,7 +711,7 @@ void DreamWebEngine::dropObject() {
 
 bool DreamWebEngine::checkObjectSize() {
 	byte containerSize = getOpenedSlotSize();
-	DynObject *object = getEitherAdCPP();
+	DynObject *object = getEitherAd();
 	// If there is no size defined for the object in the editor, set its size
 	// to 6. This could be a bad idea, according to the original source.
 	byte objectSize = (object->objectSize != 255) ? object->objectSize : 6;
@@ -798,7 +798,7 @@ void DreamWebEngine::swapWithInv() {
 	ObjectRef objectId = findInvPos();
 	_itemFrame = objectId._index;
 	_objectType = objectId._type;
-	DynObject *object = getEitherAdCPP();
+	DynObject *object = getEitherAd();
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
 	byte prevType2 = _objectType;
@@ -806,7 +806,7 @@ void DreamWebEngine::swapWithInv() {
 	_objectType = prevType;
 	_itemFrame = prevFrame;
 	delPointer();
-	object = getEitherAdCPP();
+	object = getEitherAd();
 	object->mapad[0] = 4;
 	object->mapad[1] = 255;
 	object->mapad[2] = _lastInvPos;
@@ -852,7 +852,7 @@ void DreamWebEngine::useOpened() {
 	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
-	if (isItWorn(getEitherAdCPP())) {
+	if (isItWorn(getEitherAd())) {
 		wornError();
 		return;
 	}
@@ -869,7 +869,7 @@ void DreamWebEngine::useOpened() {
 		return;
 
 	_pickUp = 0;
-	DynObject *object = getEitherAdCPP();
+	DynObject *object = getEitherAd();
 	object->mapad[0] = _openedType;
 	object->mapad[1] = _openedOb;
 	object->mapad[2] = _lastInvPos;
@@ -922,7 +922,7 @@ void DreamWebEngine::outOfOpen() {
 		_objectType = kExObjectType;
 	}
 
-	DynObject *object = getEitherAdCPP();
+	DynObject *object = getEitherAd();
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
 
@@ -949,7 +949,7 @@ void DreamWebEngine::swapWithOpen() {
 	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
-	if (isItWorn(getEitherAdCPP())) {
+	if (isItWorn(getEitherAd())) {
 		wornError();
 		return;
 	}
@@ -977,7 +977,7 @@ void DreamWebEngine::swapWithOpen() {
 		_objectType = kExObjectType;
 	}
 
-	DynObject *object = getEitherAdCPP();
+	DynObject *object = getEitherAd();
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
 
@@ -985,7 +985,7 @@ void DreamWebEngine::swapWithOpen() {
 	byte prevFrame2 = _itemFrame;
 	_objectType = prevType;
 	_itemFrame = prevFrame;
-	object = getEitherAdCPP();
+	object = getEitherAd();
 	object->mapad[0] = _openedType;
 	object->mapad[1] = _openedOb;
 	object->mapad[2] = _lastInvPos;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index f009bd5963..fb451893a3 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1280,7 +1280,7 @@ DynObject *DreamWebEngine::getExAd(uint8 index) {
 	return &_exData[index];
 }
 
-DynObject *DreamWebEngine::getEitherAdCPP() {
+DynObject *DreamWebEngine::getEitherAd() {
 	if (_objectType == kExObjectType)
 		return getExAd(_itemFrame);
 	else
@@ -1311,9 +1311,9 @@ void *DreamWebEngine::getAnyAd(uint8 *slotSize, uint8 *slotCount) {
 }
 
 void *DreamWebEngine::getAnyAdDir(uint8 index, uint8 flag) {
-	if (flag == 4)
+	if (flag == kExObjectType)
 		return getExAd(index);
-	else if (flag == 2)
+	else if (flag == kFreeObjectType)
 		return getFreeAd(index);
 	else
 		return getSetAd(index);
-- 
cgit v1.2.3