DREAMWEB: Cleanup

scummvm · Dec 14, 2011 · 5af0deb · 5af0deb
1 parent 8d804a8
commit 5af0deb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
@@ -151,6 +151,7 @@ class DreamBase : public SegmentManager {
 	SetObject *getSetAd(uint8 index);
 	void *getAnyAd(uint8 *value1, uint8 *value2);
 	const uint8 *getTextInFile1(uint16 index);
+	uint8 findNextColon(const uint8 **string);
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
@@ -1917,13 +1917,13 @@ void DreamGenContext::hangOnP(uint16 count) {
 }
 
 void DreamGenContext::findNextColon() {
-	uint8 *initialString = es.ptr(si, 0);
-	uint8 *string = initialString;
+	const uint8 *initialString = es.ptr(si, 0);
+	const uint8 *string = initialString;
 	al = findNextColon(&string);
 	si += (string - initialString);
 }
 
-uint8 DreamGenContext::findNextColon(uint8 **string) {
+uint8 DreamBase::findNextColon(const uint8 **string) {
 	uint8 c;
 	do {
 		c = **string;
@@ -1932,11 +1932,11 @@ uint8 DreamGenContext::findNextColon(uint8 **string) {
 	return c;
 }
 
-uint8 *DreamGenContext::getObTextStartCPP() {
+const uint8 *DreamGenContext::getObTextStartCPP() {
 	push(es);
 	push(si);
 	getObTextStart();
-	uint8 *result = es.ptr(si, 0);
+	const uint8 *result = es.ptr(si, 0);
 	si = pop();
 	es = pop();
 	return result;
@@ -2246,7 +2246,7 @@ void DreamGenContext::doLook() {
 	dumpTextLine();
 	uint8 index = data.byte(kRoomnum) & 31;
 	uint16 offset = getSegment(data.word(kRoomdesc)).word(kIntextdat + index * 2);
-	uint8 *string = getSegment(data.word(kRoomdesc)).ptr(kIntext, 0) + offset;
+	const uint8 *string = getSegment(data.word(kRoomdesc)).ptr(kIntext, 0) + offset;
 	findNextColon(&string);
 	uint16 x;
 	if (data.byte(kReallocation) < 50)
@@ -4655,7 +4655,7 @@ void DreamGenContext::lookAtCard() {
 	loadKeypad();
 	createPanel2();
 	showFrame(tempGraphics(), 160, 80, 42, 128);
-	uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStartCPP();
 	findNextColon(&obText);
 	findNextColon(&obText);
 	findNextColon(&obText);

diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
@@ -227,9 +227,11 @@
 	void hangOnP();
 	void hangOnP(uint16 count);
 	void showIcon();
-	uint8 findNextColon(uint8 **string);
+	uint8 findNextColon(const uint8 **string) {
+		return DreamBase::findNextColon(string);
+	}
 	void findNextColon();
-	uint8 *getObTextStartCPP();
+	const uint8 *getObTextStartCPP();
 	void useText(const uint8 *string);
 	void useText();
 	void getBlockOfPixel();

diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
@@ -139,7 +139,7 @@ void DreamGenContext::useRoutine() {
 	}
 
 	delPointer();
-	uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStartCPP();
 	if (findNextColon(&obText) != 0) {
 		if (findNextColon(&obText) != 0) {
 			if (*obText != 0) {
@@ -178,15 +178,15 @@ void DreamGenContext::useText(const uint8 *string) {
 }
 
 void DreamGenContext::showFirstUse() {
-	uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStartCPP();
 	findNextColon(&obText);
 	findNextColon(&obText);
 	useText(obText);
 	hangOnP(400);
 }
 
 void DreamGenContext::showSecondUse() {
-	uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStartCPP();
 	findNextColon(&obText);
 	findNextColon(&obText);
 	findNextColon(&obText);