[Scummvm-cvs-logs] scummvm master -> 25675e885857fb152bd47cbce4588fc1f6a81f99

[tramboi]

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:
25675e8858 DREAMWEB: Structs member renaming


Commit: 25675e885857fb152bd47cbce4588fc1f6a81f99
    https://github.com/scummvm/scummvm/commit/25675e885857fb152bd47cbce4588fc1f6a81f99
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-08-29T18:26:19-07:00

Commit Message:
DREAMWEB: Structs member renaming

Changed paths:
    engines/dreamweb/backdrop.cpp
    engines/dreamweb/structs.h
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 4ffd589..ed7836a 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -153,7 +153,7 @@ void DreamGenContext::showallobs() {
 	SetObject *setEntries = (SetObject *)segRef(data.word(kSetdat)).ptr(0, 128 * sizeof(SetObject));
 	for (size_t i = 0; i < 128; ++i) {
 		SetObject *setEntry = setEntries + i;
-		if (getmapad(setEntry->b58) == 0)
+		if (getmapad(setEntry->mapad) == 0)
 			continue;
 		uint8 currentFrame = setEntry->b18[0];
 		data.word(kCurrentframe) = currentFrame;
@@ -308,11 +308,11 @@ void DreamGenContext::showallex() {
 	DynObject *objects = (DynObject *)segRef(data.word(kExtras)).ptr(kExdata, sizeof(DynObject));
 	for (size_t i = 0; i < 100; ++i, ++data.byte(kCurrentex)) {
 		DynObject *object = objects + i;
-		if (object->b2[0] == 0xff)
+		if (object->mapad[0] == 0xff)
 			continue;
 		if (object->currentLocation != data.byte(kReallocation))
 			continue;
-		if (getmapad(object->b2) == 0)
+		if (getmapad(object->mapad) == 0)
 			continue;
 		data.word(kCurrentframe) = 3 * data.byte(kCurrentex);
 		uint8 width, height;
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 0b99b01..9b8d823 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -114,14 +114,14 @@ struct SetObject {
 	uint8 b55;
 	uint8 b56;
 	uint8 b57;
-	uint8 b58[5];
+	uint8 mapad[5];
 	uint8 b63;
 };
 
 struct DynObject {
 	uint8 currentLocation;
 	uint8 index;
-	uint8 b2[5];
+	uint8 mapad[5];
 	uint8 b7;
 	uint8 b8;
 	uint8 b9;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 37125d8..35f9df0 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1198,11 +1198,11 @@ void DreamGenContext::dochange() {
 
 void DreamGenContext::dochange(uint8 index, uint8 value, uint8 type) {
 	if (type == 0) { //object
-		getsetad(index)->b58[0] = value;
+		getsetad(index)->mapad[0] = value;
 	} else if (type == 1) { //freeobject
 		DynObject *freeObject = getfreead(index);
-		if (freeObject->b2[0] == 0xff)
-			freeObject->b2[0] = value;
+		if (freeObject->mapad[0] == 0xff)
+			freeObject->mapad[0] = value;
 	} else { //path
 		bx = kPathdata + (type - 100) * 144 + index * 8;
 		es = data.word(kReels);
@@ -1217,7 +1217,7 @@ void DreamGenContext::deletetaken() {
 		uint8 location = extraObjects[i].initialLocation;
 		if (location == data.byte(kReallocation)) {
 			uint8 index = extraObjects[i].index;
-			freeObjects[index].b2[0] = 254;
+			freeObjects[index].mapad[0] = 0xfe;
 		}
 	}
 }
@@ -1225,7 +1225,7 @@ void DreamGenContext::deletetaken() {
 void DreamGenContext::getexpos() {
 	const DynObject *objects = (const DynObject *)segRef(data.word(kExtras)).ptr(kExdata, sizeof(DynObject));
 	for (size_t i = 0; i < kNumexobjects; ++i) {
-		if (objects[i].b2[0] == 0xff) {
+		if (objects[i].mapad[0] == 0xff) {
 			data.byte(kExpos) = i;
 			return;
 		}
@@ -1239,7 +1239,7 @@ void DreamGenContext::placesetobject() {
 
 void DreamGenContext::placesetobject(uint8 index) {
 	findormake(index, 0, 0);
-	getsetad(index)->b58[0] = 0;
+	getsetad(index)->mapad[0] = 0;
 }
 
 void DreamGenContext::removesetobject() {
@@ -1248,7 +1248,7 @@ void DreamGenContext::removesetobject() {
 
 void DreamGenContext::removesetobject(uint8 index) {
 	findormake(index, 0xff, 0);
-	getsetad(index)->b58[0] = 0xff;
+	getsetad(index)->mapad[0] = 0xff;
 }
 
 void DreamGenContext::finishedwalking() {