From a4643a0484fe1f54a2cc60ad146cf459012bd0f1 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 26 Dec 2011 01:41:15 +0100
Subject: DREAMWEB: Move titles.cpp to DreamBase

---
 engines/dreamweb/dreambase.h | 12 ++++++++++++
 engines/dreamweb/stubs.cpp   |  4 ++--
 engines/dreamweb/stubs.h     | 12 ------------
 engines/dreamweb/titles.cpp  | 20 ++++++++++----------
 4 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 3bc2757ac8..2f9a9e82c4 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -564,7 +564,17 @@ public:
 	void redes();
 
 	// from titles.cpp
+	void endGame();
+	void monkSpeaking();
+	void gettingShot();
+	void bibleQuote();
 	void hangOne(uint16 delay);
+	void intro();
+	void runIntroSeq();
+	void runEndSeq();
+	void loadIntroRoom();
+	void set16ColPalette();
+	void realCredits();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
@@ -655,6 +665,8 @@ public:
 	void useTrainer();
 	void useStereo();
 	void chewy();
+	void delEverything();
+	void afterIntroRoom();
 
 	// from vgafades.cpp
 	void clearStartPal();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 0026d63204..f21927c57d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2757,7 +2757,7 @@ void DreamGenContext::walkIntoRoom() {
 	}
 }
 
-void DreamGenContext::afterIntroRoom() {
+void DreamBase::afterIntroRoom() {
 	if (data.byte(kNowinnewroom) == 0)
 		return; // notnewintro
 
@@ -2861,7 +2861,7 @@ void DreamBase::describeOb() {
 	}
 }
 
-void DreamGenContext::delEverything() {
+void DreamBase::delEverything() {
 	if (data.byte(kMapysize) + data.word(kMapoffsety) < 182) {
 		mapToPanel();
 	} else {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 9e1649dcaa..dd6cd37f8c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -107,33 +107,21 @@
 	void inventory();
 	void mainScreen();
 	void zoomOnOff();
-	void bibleQuote();
-	void realCredits();
-	void runIntroSeq();
-	void intro();
 	void pickupOb(uint8 command, uint8 pos);
 	void initialInv();
 	void walkIntoRoom();
-	void loadIntroRoom();
-	void afterIntroRoom();
-	void gettingShot();
 	void allPointer();
-	void delEverything();
 	void errorMessage1();
 	void errorMessage2();
 	void errorMessage3();
-	void set16ColPalette();
 	void afterNewRoom();
 	void madmanRun();
 	void decide();
 	void showGun();
-	void endGame();
-	void monkSpeaking();
 	void triggerMessage(uint16 index);
 	void processTrigger();
 	void updateSymbolTop();
 	void updateSymbolBot();
-	void runEndSeq();
 	bool execCommand();
 	void getOpenedSize();
 	byte getOpenedSlotSize();
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index f3dafa38d9..a521036202 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -25,7 +25,7 @@
 
 namespace DreamGen {
 
-void DreamGenContext::endGame() {
+void DreamBase::endGame() {
 	loadTempText("DREAMWEB.T83");
 	monkSpeaking();
 	gettingShot();
@@ -35,7 +35,7 @@ void DreamGenContext::endGame() {
 	hangOn(200);
 }
 
-void DreamGenContext::monkSpeaking() {
+void DreamBase::monkSpeaking() {
 	// FIXME: This is the CD version only.
 
 	data.byte(kRoomssample) = 35;
@@ -68,7 +68,7 @@ void DreamGenContext::monkSpeaking() {
 	getRidOfTemp();
 }
 
-void DreamGenContext::gettingShot() {
+void DreamBase::gettingShot() {
 	data.byte(kNewlocation) = 55;
 	clearPalette();
 	loadIntroRoom();
@@ -79,7 +79,7 @@ void DreamGenContext::gettingShot() {
 	clearBeforeLoad();
 }
 
-void DreamGenContext::bibleQuote() {
+void DreamBase::bibleQuote() {
 	initGraphics(640, 480, true);
 
 	showPCX("DREAMWEB.I00");
@@ -118,7 +118,7 @@ void DreamBase::hangOne(uint16 delay) {
 	} while	(--delay);
 }
 
-void DreamGenContext::intro() {
+void DreamBase::intro() {
 	loadTempText("DREAMWEB.T82");
 	loadPalFromIFF();
 	setMode();
@@ -174,7 +174,7 @@ void DreamGenContext::intro() {
 	data.byte(kLasthardkey) =  0;
 }
 
-void DreamGenContext::runIntroSeq() {
+void DreamBase::runIntroSeq() {
 	data.byte(kGetback) = 0;
 
 	do {
@@ -220,7 +220,7 @@ void DreamGenContext::runIntroSeq() {
 	//clearBeforeLoad();
 }
 
-void DreamGenContext::runEndSeq() {
+void DreamBase::runEndSeq() {
 	atmospheres();
 	data.byte(kGetback) = 0;
 
@@ -240,7 +240,7 @@ void DreamGenContext::runEndSeq() {
 	} while (data.byte(kGetback) != 1);
 }
 
-void DreamGenContext::loadIntroRoom() {
+void DreamBase::loadIntroRoom() {
 	data.byte(kIntrocount) = 0;
 	data.byte(kLocation) = 255;
 	loadRoom();
@@ -259,10 +259,10 @@ void DreamGenContext::loadIntroRoom() {
 	workToScreen();
 }
 
-void DreamGenContext::set16ColPalette() {
+void DreamBase::set16ColPalette() {
 }
 
-void DreamGenContext::realCredits() {
+void DreamBase::realCredits() {
 	data.byte(kRoomssample) = 33;
 	loadRoomsSample();
 	data.byte(kVolume) = 0;
-- 
cgit v1.2.3