[Scummvm-cvs-logs] scummvm master -> e412078319c11206617c8d86d9b6f166b4526287

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e412078319 DREAMWEB: Name the return values of getAnyAd


Commit: e412078319c11206617c8d86d9b6f166b4526287
    https://github.com/scummvm/scummvm/commit/e412078319c11206617c8d86d9b6f166b4526287
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-25T04:13:48-08:00

Commit Message:
DREAMWEB: Name the return values of getAnyAd

Changed paths:
    engines/dreamweb/dreambase.h
    engines/dreamweb/stubs.cpp
    engines/dreamweb/stubs.h



diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 3b53353..2a61331 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -403,7 +403,7 @@ public:
 	void showMan();
 	void panelIcons1();
 	SetObject *getSetAd(uint8 index);
-	void *getAnyAd(uint8 *value1, uint8 *value2);
+	void *getAnyAd(uint8 *slotSize, uint8 *slotCount);
 	const uint8 *getTextInFile1(uint16 index);
 	uint8 findNextColon(const uint8 **string);
 	void allocateBuffers();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2120668..2ad4af8 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1309,16 +1309,16 @@ DynObject *DreamBase::getEitherAdCPP() {
 		return getFreeAd(data.byte(kItemframe));
 }
 
-void *DreamBase::getAnyAd(uint8 *value1, uint8 *value2) {
+void *DreamBase::getAnyAd(uint8 *slotSize, uint8 *slotCount) {
 	if (data.byte(kObjecttype) == kExObjectType) {
 		DynObject *exObject = getExAd(data.byte(kCommand));
-		*value1 = exObject->slotSize;
-		*value2 = exObject->slotCount;
+		*slotSize = exObject->slotSize;
+		*slotCount = exObject->slotCount;
 		return exObject;
 	} else if (data.byte(kObjecttype) == kFreeObjectType) {
 		DynObject *freeObject = getFreeAd(data.byte(kCommand));
-		*value1 = freeObject->slotSize;
-		*value2 = freeObject->slotCount;
+		*slotSize = freeObject->slotSize;
+		*slotCount = freeObject->slotCount;
 		return freeObject;
 	} else {	// 1 or 3. 0 should never happen
 		SetObject *setObject = getSetAd(data.byte(kCommand));
@@ -1326,8 +1326,8 @@ void *DreamBase::getAnyAd(uint8 *value1, uint8 *value2) {
 		// instead of slotSize/slotCount (bytes 3 and 4).
 		// Changed this for consistency with the Ex/Free cases, and also
 		// with getOpenedSize()
-		*value1 = setObject->slotSize;
-		*value2 = setObject->slotCount;
+		*slotSize = setObject->slotSize;
+		*slotCount = setObject->slotCount;
 		return setObject;
 	}
 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 0f473c8..ed0afa4 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -71,8 +71,8 @@
 	DynObject *getExAd(uint8 index) {
 		return DreamBase::getExAd(index);
 	}
-	void *getAnyAd(uint8 *value1, uint8 *value2) {
-		return DreamBase::getAnyAd(value1, value2);
+	void *getAnyAd(uint8 *slotSize, uint8 *slotCount) {
+		return DreamBase::getAnyAd(slotSize, slotCount);
 	}
 	SetObject *getSetAd(uint8 index) {
 		return DreamBase::getSetAd(index);