From 42068065b57993c865823ff56e81bd7a87aa0278 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 24 Dec 2011 13:55:56 +0100
Subject: DREAMWEB: Move more functions to DreamBase

---
 engines/dreamweb/object.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

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

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 04081e2f0e..1245187a92 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -66,7 +66,7 @@ bool DreamBase::isItWorn(const DynObject *object) {
 	return (object->id[0] == 'W'-'A') && (object->id[1] == 'E'-'A');
 }
 
-void DreamGenContext::wornError() {
+void DreamBase::wornError() {
 	data.byte(kCommandtype) = 255;
 	delPointer();
 	printMessage(76, 21, 57, 240, false);
@@ -79,7 +79,7 @@ void DreamGenContext::wornError() {
 	workToScreenM();
 }
 
-void DreamGenContext::makeWorn(DynObject *object) {
+void DreamBase::makeWorn(DynObject *object) {
 	object->id[0] = 'W'-'A';
 	object->id[1] = 'E'-'A';
 }
@@ -461,10 +461,6 @@ void DreamGenContext::setPickup() {
 	workToScreenM();
 }
 
-void DreamGenContext::deleteExFrame() {
-	deleteExFrame(al);
-}
-
 void DreamBase::deleteExFrame(uint8 frameNum) {
 	Frame *frame = (Frame *)getSegment(data.word(kExtras)).ptr(kExframedata + sizeof(Frame)*frameNum, sizeof(Frame));
 
@@ -488,10 +484,6 @@ void DreamBase::deleteExFrame(uint8 frameNum) {
 	}
 }
 
-void DreamGenContext::deleteExText() {
-	deleteExText(al);
-}
-
 void DreamBase::deleteExText(uint8 textNum) {
 	uint16 offset = getSegment(data.word(kExtras)).word(kExtextdat + 2*textNum);
 
@@ -704,7 +696,7 @@ const uint8 *DreamBase::getObTextStart() {
 	}
 }
 
-void DreamGenContext::dropObject() {
+void DreamBase::dropObject() {
 	if (data.byte(kCommandtype) != 223) {
 		data.byte(kCommandtype) = 223;
 		if (!data.byte(kPickup)) {
-- 
cgit v1.2.3