[Scummvm-cvs-logs] scummvm master -> 2db59ab3111746df973641bf960b68765671ff22

[wjp]

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:
2db59ab311 DREAMWEB: Move even more use-related functions to DreamBase


Commit: 2db59ab3111746df973641bf960b68765671ff22
    https://github.com/scummvm/scummvm/commit/2db59ab3111746df973641bf960b68765671ff22
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-26T04:02:18-08:00

Commit Message:
DREAMWEB: Move even more use-related functions to DreamBase

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



diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 5ac720b..c96604a 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -61,6 +61,9 @@ class DreamBase : public SegmentManager {
 protected:
 	DreamWeb::DreamWebEngine *engine;
 
+	// from newplace.cpp
+	uint8 _roomsCanGo[16];
+
 	// from object.cpp
 	uint16 _openChangeSize;
 
@@ -98,7 +101,6 @@ protected:
 	uint8 _underTimedText[kUnderTimedTextBufSize];
 	Common::List<Rain> _rainList;
 	uint8 _initialVars[kLengthOfVars]; // TODO: This shouldn't be necessary
-	uint8 _roomsCanGo[16];
 
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
@@ -556,6 +558,11 @@ public:
 	bool finishedWalking();
 	void emergencyPurge();
 	void purgeAnItem();
+	uint8 nextSymbol(uint8 symbol);
+	void enterSymbol();
+	void showSymbol();
+	void updateSymbolTop();
+	void updateSymbolBot();
 
 	// from talk.cpp
 	void talk();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 827fb2e..8535b17 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1813,7 +1813,7 @@ uint8 DreamBase::findNextColon(const uint8 **string) {
 	return c;
 }
 
-void DreamGenContext::enterSymbol() {
+void DreamBase::enterSymbol() {
 	data.byte(kManisoffscreen) = 1;
 	getRidOfReels();
 	loadIntoTemp("DREAMWEB.G12"); // symbol graphics
@@ -2611,7 +2611,7 @@ void DreamBase::atmospheres() {
 	cancelCh0();
 }
 
-uint8 DreamGenContext::nextSymbol(uint8 symbol) {
+uint8 DreamBase::nextSymbol(uint8 symbol) {
 	uint8 result = symbol + 1;
 	if (result == 6)
 		return 0;
@@ -2620,7 +2620,7 @@ uint8 DreamGenContext::nextSymbol(uint8 symbol) {
 	return result;
 }
 
-void DreamGenContext::showSymbol() {
+void DreamBase::showSymbol() {
 	showFrame(tempGraphics(), kSymbolx, kSymboly, 12, 0);
 
 	showFrame(tempGraphics(), data.byte(kSymboltopx) + kSymbolx-44, kSymboly+20, data.byte(kSymboltopnum), 32);
@@ -3451,7 +3451,7 @@ void DreamBase::entryAnims() {
 	}
 }
 
-void DreamGenContext::updateSymbolTop() {
+void DreamBase::updateSymbolTop() {
 	if (!data.byte(kSymboltopdir))
 		return; // topfinished
 
@@ -3488,7 +3488,7 @@ void DreamGenContext::updateSymbolTop() {
 	}
 }
 
-void DreamGenContext::updateSymbolBot() {
+void DreamBase::updateSymbolBot() {
 	if (!data.byte(kSymbolbotdir))
 		return; // botfinished
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 7301ba9..a03dbc2 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -98,12 +98,9 @@
 	void look();
 	void autoLook();
 	void doLook();
-	void enterSymbol();
 	void useKey();
 	void useObject();
 	void singleKey(uint8 key, uint16 x, uint16 y);
-	uint8 nextSymbol(uint8 symbol);
-	void showSymbol();
 	void inventory();
 	void mainScreen();
 	void zoomOnOff();
@@ -120,8 +117,6 @@
 	void showGun();
 	void triggerMessage(uint16 index);
 	void processTrigger();
-	void updateSymbolTop();
-	void updateSymbolBot();
 	bool execCommand();
 	void getOpenedSize();
 	byte getOpenedSlotSize();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 8aa735d..24ea58e 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -99,7 +99,7 @@ void DreamGenContext::useRoutine() {
 		{ &DreamBase::viewFolder,              "PAPR" },
 		{ &DreamBase::useTrainer,              "UWTA" },
 		{ &DreamBase::useTrainer,              "UWTB" },
-		{ &DreamGenContext::enterSymbol,       "STAT" },
+		{ &DreamBase::enterSymbol,             "STAT" },
 		{ &DreamBase::openTomb,                "TLID" },
 		{ &DreamBase::useSlab,                 "SLAB" },
 		{ &DreamBase::useCart,                 "CART" },