DREAMWEB: Move some data accessor functions to DreamBase

6 files changed, 20 insertions, 16 deletions

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index bad977c2df..c0ca7c864e 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -51,9 +51,13 @@ public:
 	DreamBase(DreamWeb::DreamWebEngine *en) : engine(en) { }
 
 public:
+	// from monitor.cpp
+	void printOuterMon();
+
 	// from pathfind.cpp
 	Common::Point _lineData[200];		// Output of Bresenham
 	void checkDest(const RoomPaths *roomsPaths);
+	RoomPaths *getRoomsPaths();
 
 	// from print.cpp
 	uint8 getNextWord(const Frame *charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount);
@@ -71,12 +75,20 @@ public:
 	void cancelCh1();
 	void loadRoomsSample();
 
+	// from sprite.cpp
+	Sprite *spriteTable();
+	Reel *getReelStart();
+
 	// from stubs.cpp
 	void crosshair();
 	void showBlink();
 	void dumpBlink();
 	void dumpPointer();
 	void showRyanPage();
+	Frame *tempGraphics();
+	Frame *tempGraphics2();
+	Frame *tempGraphics3();
+	void showArrows();
 
 	// from vgafades.cpp
 	uint8 *mainPalette();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 40bf8ed1be..c6bfd487a3 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -278,7 +278,7 @@ void DreamGenContext::turnOnPower() {
 	powerLightOn();
 }
 
-void DreamGenContext::printOuterMon() {
+void DreamBase::printOuterMon() {
 	showFrame(tempGraphics(), 40, 32, 1, 0);
 	showFrame(tempGraphics(), 264, 32, 2, 0);
 	showFrame(tempGraphics(), 40, 12, 3, 0);
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index ff2659c235..0f717a983f 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -68,7 +68,7 @@ void DreamGenContext::turnAnyPathOff() {
 	turnAnyPathOff(al, ah);
 }
 
-RoomPaths *DreamGenContext::getRoomsPaths() {
+RoomPaths *DreamBase::getRoomsPaths() {
 	void *result = getSegment(data.word(kReels)).ptr(data.byte(kRoomnum) * 144, 144);
 	return (RoomPaths *)result;
 }
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 14794a81a8..a44cd8d60c 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -24,7 +24,7 @@
 
 namespace DreamGen {
 
-Sprite *DreamGenContext::spriteTable() {
+Sprite *DreamBase::spriteTable() {
 	Sprite *sprite = (Sprite *)getSegment(data.word(kBuffers)).ptr(kSpritetable, 16 * sizeof(Sprite));
 	return sprite;
 }
@@ -482,7 +482,7 @@ Frame *DreamGenContext::findSource() {
 	}
 }
 
-Reel *DreamGenContext::getReelStart() {
+Reel *DreamBase::getReelStart() {
 	Reel *reel = (Reel *)getSegment(data.word(kReels)).ptr(kReellist + data.word(kReelpointer) * sizeof(Reel) * 8, sizeof(Reel));
 	return reel;
 }
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 587346a898..cc5d04b107 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2307,15 +2307,15 @@ void DreamGenContext::readSetData() {
 	//engine->closeFile();
 }
 
-Frame * DreamGenContext::tempGraphics() {
+Frame * DreamBase::tempGraphics() {
 	return (Frame *)getSegment(data.word(kTempgraphics)).ptr(0, 0);
 }
 
-Frame * DreamGenContext::tempGraphics2() {
+Frame * DreamBase::tempGraphics2() {
 	return (Frame *)getSegment(data.word(kTempgraphics2)).ptr(0, 0);
 }
 
-Frame * DreamGenContext::tempGraphics3() {
+Frame * DreamBase::tempGraphics3() {
 	return (Frame *)getSegment(data.word(kTempgraphics3)).ptr(0, 0);
 }
 
@@ -3779,7 +3779,7 @@ void DreamGenContext::examineInventory() {
 	workToScreenM();
 }
 
-void DreamGenContext::showArrows() {
+void DreamBase::showArrows() {
 	showFrame(tempGraphics(), 116 - 12, 16, 0, 0);
 	showFrame(tempGraphics(), 226 + 12, 16, 1, 0);
 	showFrame(tempGraphics(), 280, 14, 2, 0);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 92a703bc63..fe1706c9c5 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -85,7 +85,6 @@
 	void oldToNames();
 	void namesToOld();
 	void startLoading(const Room &room);
-	Sprite *spriteTable();
 	void showFrame();
 	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
 		DreamBase::showFrame(frameData, x, y, frameNumber, effectsFlag, width, height);
@@ -129,11 +128,9 @@
 	void turnAnyPathOff(uint8 param, uint8 room);
 	void turnAnyPathOn();
 	void turnAnyPathOff();
-	RoomPaths *getRoomsPaths();
 	void makeBackOb(SetObject *objData);
 	void lockMon();
 	void plotReel();
-	Reel *getReelStart();
 	void dealWithSpecial(uint8 firstParam, uint8 secondParam);
 	void zoom();
 	void showRain();
@@ -289,9 +286,6 @@
 	void input();
 	void monPrint();
 	const char *monPrint(const char *string);
-	Frame *tempGraphics();
-	Frame *tempGraphics2();
-	Frame *tempGraphics3();
 	void accessLightOn();
 	void accessLightOff();
 	void randomAccess(uint16 count);
@@ -558,7 +552,5 @@
 	void getTime();
 	void set16ColPalette();
 	void examineInventory();
-	void printOuterMon();
-	void showArrows();
 
 #endif