[Scummvm-cvs-logs] scummvm master -> 95c9a6d8cd93b7cbe921e391f207450f6082d99a

[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:
95c9a6d8cd DREAMWEB: Move all of the functions in newplace.cpp into DreamBase


Commit: 95c9a6d8cd93b7cbe921e391f207450f6082d99a
    https://github.com/scummvm/scummvm/commit/95c9a6d8cd93b7cbe921e391f207450f6082d99a
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-25T11:10:20-08:00

Commit Message:
DREAMWEB: Move all of the functions in newplace.cpp into DreamBase

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



diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index e023d97..41409bc 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -184,6 +184,10 @@ public:
 	void locationPic();
 	void selectLocation();
 	void newPlace();
+	void nextDest();
+	void lastDest();
+	void destSelect();
+	void lookAtPlace();
 
 	// from object.cpp
 	void obIcons();
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index e311f44..4942804 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -72,11 +72,11 @@ void DreamBase::selectLocation() {
 		if (data.byte(kGetback) == 1)
 			break;
 
-		RectWithCallback<DreamGenContext> destList[] = {
-			{ 238,258,4,44,&DreamGenContext::nextDest },
-			{ 104,124,4,44,&DreamGenContext::lastDest },
-			{ 280,308,4,44,&DreamGenContext::lookAtPlace },
-			{ 104,216,138,192,&DreamGenContext::destSelect },
+		RectWithCallback<DreamBase> destList[] = {
+			{ 238,258,4,44,&DreamBase::nextDest },
+			{ 104,124,4,44,&DreamBase::lastDest },
+			{ 280,308,4,44,&DreamBase::lookAtPlace },
+			{ 104,216,138,192,&DreamBase::destSelect },
 			{ 273,320,157,198,&DreamBase::getBack1 },
 			{ 0,320,0,200,&DreamBase::blank },
 			{ 0xFFFF,0,0,0,0 }
@@ -101,7 +101,7 @@ void DreamBase::showCity() {
 	showFrame(tempGraphics(), 120+57, 32, 1, 0);
 }
 
-void DreamGenContext::lookAtPlace() {
+void DreamBase::lookAtPlace() {
 	if (data.byte(kCommandtype) != 224) {
 		data.byte(kCommandtype) = 224;
 		commandOnly(27);
@@ -164,7 +164,7 @@ void DreamBase::showArrows() {
 	showFrame(tempGraphics(), 280, 14, 2, 0);
 }
 
-void DreamGenContext::nextDest() {
+void DreamBase::nextDest() {
 	if (data.byte(kCommandtype) != 218) {
 		data.byte(kCommandtype) = 218;
 		commandOnly(28);
@@ -193,7 +193,7 @@ void DreamGenContext::nextDest() {
 	delPointer();
 }
 
-void DreamGenContext::lastDest() {
+void DreamBase::lastDest() {
 	if (data.byte(kCommandtype) != 219) {
 		data.byte(kCommandtype) = 219;
 		commandOnly(29);
@@ -222,7 +222,7 @@ void DreamGenContext::lastDest() {
 	delPointer();
 }
 
-void DreamGenContext::destSelect() {
+void DreamBase::destSelect() {
 	if (data.byte(kCommandtype) != 222) {
 		data.byte(kCommandtype) = 222;
 		commandOnly(30);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index e447b70..148436e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -148,9 +148,6 @@
 	void errorMessage1();
 	void errorMessage2();
 	void errorMessage3();
-	void nextDest();
-	void lastDest();
-	void destSelect();
 	void loadSpeech();
 	bool loadSpeech(byte type1, int idx1, byte type2, int idx2) {
 		return DreamBase::loadSpeech(type1, idx1, type2, idx2);
@@ -182,7 +179,6 @@
 	void setPickup();
 	void getKeyAndLogo();
 	void signOn();
-	void lookAtPlace();
 	void inToInv();
 	void outOfInv();
 	void selectOpenOb();