From 7c81f75d276c2f6897780172df61b9cbea7b2719 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <wjp@usecode.org>
Date: Wed, 7 Dec 2011 08:25:14 +0100
Subject: [PATCH] DREAMWEB: Use symbolic constants and move functions to right
 files

---
 engines/dreamweb/keypad.cpp   | 16 ++++++++++++++++
 engines/dreamweb/stubs.cpp    |  5 +++++
 engines/dreamweb/vgagrafx.cpp | 21 ---------------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index cfb7973c36c..44b01c4cc9c 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -228,4 +228,20 @@ void DreamGenContext::showOuterPad() {
 	showFrame(tempGraphics(), kKeypadx+74, kKeypady+76, 37, 0);
 }
 
+void DreamGenContext::dumpKeypad() {
+	multiDump(kKeypadx - 3, kKeypady - 4, 120, 90);
+}
+
+void DreamGenContext::dumpSymbol() {
+	data.byte(kNewtextline) = 0;
+	multiDump(kSymbolx, kSymboly + 20, 104, 60);
+}
+
+void DreamGenContext::dumpSymBox() {
+	if (data.word(kDumpx) != 0xFFFF) {
+		multiDump(data.word(kDumpx), data.word(kDumpy), 30, 77);
+		data.word(kDumpx) = 0xFFFF;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index af1250af482..73bcbdae416 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3829,4 +3829,9 @@ void DreamGenContext::isSetObOnMap() {
 	flags._z = isSetObOnMap(al);
 }
 
+void DreamGenContext::dumpZoom() {
+	if (data.byte(kZoomon) == 1)
+		multiDump(kZoomx + 5, kZoomy + 4, 46, 40);
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 1e678d059be..3e1d97e5cae 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -497,25 +497,4 @@ void DreamGenContext::createPanel2() {
 	showFrame(engine->icons2(), 160, 0, 5, 2);
 }
 
-void DreamGenContext::dumpKeypad() {
-	multiDump((36 + 112) - 3, 72 - 4, 120, 90);
-}
-
-void DreamGenContext::dumpSymbol() {
-	data.byte(kNewtextline) = 0;
-	multiDump(64, 56 + 20, 104, 60);
-}
-
-void DreamGenContext::dumpZoom() {
-	if (data.byte(kZoomon) == 1)
-		multiDump(8 + 5, 132 + 4, 46, 40);
-}
-
-void DreamGenContext::dumpSymBox() {
-	if (data.word(kDumpx) != 0xFFFF) {
-		multiDump(data.word(kDumpx), data.word(kDumpy), 30, 77);
-		data.word(kDumpx) = 0xFFFF;
-	}
-}
-
 } // End of namespace DreamGen