From 5f992234deb2e0348126fb3f76907b8a586c90be Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Mon, 5 Dec 2011 15:06:58 +0000
Subject: DREAMWEB: Modified 'showPCX' to allow passing of file name string.

This will allow migration of fixing string values in the cs segment.
---
 engines/dreamweb/dreamgen.h   | 5 ++---
 engines/dreamweb/stubs.h      | 6 ++++++
 engines/dreamweb/vgagrafx.cpp | 7 +++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'engines/dreamweb')

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 756a280520..e2ffcbed68 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -571,7 +571,7 @@ public:
 	void watchReel();
 	void openFileFromC();
 	void getTime();
-	void candles1();
+	void pickupOb();
 	void fadeDOS();
 	void findText1();
 	void isRyanHolding();
@@ -649,7 +649,6 @@ public:
 	void walkIntoRoom();
 	void useHatch();
 	void printOuterMon();
-	void showPCX();
 	void showDecisions();
 	void removeObFromInv();
 	void useCoveredBox();
@@ -785,7 +784,7 @@ public:
 	void drawItAll();
 	void useStereo();
 	void candles2();
-	void pickupOb();
+	void candles1();
 	void showOpBox();
 	void clearBeforeLoad();
 	void bibleQuote();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a4515012a1..c26aa3001c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
+#ifndef DREAMWEB_STUBS_H
+#define DREAMWEB_STUBS_H
+
 	void screenUpdate();
 	bool quitRequested();
 	void startup();
@@ -446,4 +449,7 @@
 	void readKey();
 	void hangOne(uint16 delay);
 	void hangOne();
+	void showPCX(::Common::String name);
+	void showPCX();
 
+#endif
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 847aa08bed..e7efc22bf3 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -219,8 +219,7 @@ static Common::String getFilename(Context &context) {
 	return name;
 }
 
-void DreamGenContext::showPCX() {
-	Common::String name = getFilename(*this);
+void DreamGenContext::showPCX(::Common::String name) {
 	Common::File pcxFile;
 
 	if (!pcxFile.open(name)) {
@@ -289,6 +288,10 @@ void DreamGenContext::showPCX() {
 	pcxFile.close();
 }
 
+void DreamGenContext::showPCX() {
+	showPCX(getFilename(*this));
+}
+
 void DreamGenContext::frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y) {
 	// NB : These resilience checks were not in the original engine, but did they result in undefined behaviour
 	// or was something broken during porting to C++?
-- 
cgit v1.2.3