From 1ba4f0a1a8965ee141987693770d2bcd3b74c292 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 22:31:50 +0200
Subject: Revert "DREAMWEB: Remove dead code and move most functions to
 DreamBase"

This reverts commit 4c66f74b58e9a2c191f22a37f485047dd19be131.

These functions aren't ready to be moved yet till the remaining two are
finished, and they're so crossreferenced that the safest thing to do is
revert this commit and break it down to smaller chunks
---
 engines/dreamweb/monitor.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'engines/dreamweb/monitor.cpp')

diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 5e84c82962..0caf4b7c25 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -233,7 +233,7 @@ void DreamBase::input() {
 }
 
 void DreamGenContext::makeCaps() {
-	al = DreamBase::makeCaps(al);
+	al = makeCaps(al);
 }
 
 byte DreamBase::makeCaps(byte c) {
@@ -312,6 +312,10 @@ void DreamBase::accessLightOff() {
 	multiDump(74, 182, 12, 8);
 }
 
+void DreamGenContext::randomAccess() {
+	randomAccess(cx);
+}
+
 void DreamBase::randomAccess(uint16 count) {
 	for (uint16 i = 0; i < count; ++i) {
 		vSync();
@@ -326,7 +330,7 @@ void DreamBase::randomAccess(uint16 count) {
 }
 
 void DreamGenContext::monMessage() {
-	DreamBase::monMessage(al);
+	monMessage(al);
 }
 
 void DreamBase::monMessage(uint8 index) {
@@ -547,7 +551,7 @@ void DreamGenContext::read() {
 	}
 }
 
-void DreamBase::signOn() {
+void DreamGenContext::signOn() {
 	const char *name = parser();
 
 	int8 foundIndex = -1;
@@ -605,7 +609,7 @@ void DreamBase::signOn() {
 	}
 }
 
-void DreamBase::searchForFiles(uint16 segment) {
+void DreamGenContext::searchForFiles(uint16 segment) {
 	const char *filesString = (const char *)getSegment(segment).ptr(kTextstart, 0);
 	byte curChar;
 
-- 
cgit v1.2.3