[Scummvm-cvs-logs] scummvm master -> d6c371e6ff6759aea643440b6b42b261bb4ff528

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d6c371e6ff DREAMWEB: Port 'middlepanel' to C++


Commit: d6c371e6ff6759aea643440b6b42b261bb4ff528
    https://github.com/scummvm/scummvm/commit/d6c371e6ff6759aea643440b6b42b261bb4ff528
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-08T02:10:43-08:00

Commit Message:
DREAMWEB: Port 'middlepanel' to C++

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreambase.h
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/stubs.cpp



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 5f0fc15..bf24486 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -440,6 +440,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'manasleep2',
 	'mansatstill',
 	'maptopanel',
+	'middlepanel',
 	'mode640x480',
 	'modifychar',
 	'monkandryan',
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index e56018d..3849e46 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -90,6 +90,7 @@ public:
 	Frame *tempGraphics3();
 	void showArrows();
 	void showOpBox();
+	void middlePanel();
 
 	// from vgafades.cpp
 	uint8 *mainPalette();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 81b1f29..d5d1e18 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -7219,34 +7219,6 @@ success:
 	data.byte(kTurndirection) = 0;
 }
 
-void DreamGenContext::middlePanel() {
-	STACK_CHECK;
-	ds = data.word(kTempsprites);
-	di = 72+47+20;
-	bx = 0;
-	al = 48;
-	ah = 0;
-	showFrame();
-	ds = data.word(kTempsprites);
-	di = 72+19;
-	bx = 21;
-	al = 47;
-	ah = 0;
-	showFrame();
-	ds = data.word(kTempsprites);
-	di = 160+23;
-	bx = 0;
-	al = 48;
-	ah = 4;
-	showFrame();
-	ds = data.word(kTempsprites);
-	di = 160+71;
-	bx = 21;
-	al = 47;
-	ah = 4;
-	showFrame();
-}
-
 void DreamGenContext::getUnderZoom() {
 	STACK_CHECK;
 	di = (8)+5;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7a6b384..fcbc61e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -600,7 +600,6 @@ public:
 	void useKey();
 	void lockLightOn();
 	void discOps();
-	void middlePanel();
 	void monitorLogo();
 	void dirFile();
 	void pickupConts();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2fdb142..a4c02e8 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3802,4 +3802,12 @@ void DreamGenContext::showSaveOps() {
 	printMessage(kOpsx + 104, kOpsy + 14, 54, 101, (101 & 1));
 }
 
+void DreamBase::middlePanel() {
+	Frame *tempSprites = (Frame *)getSegment(data.word(kTempsprites)).ptr(0, 0);
+	showFrame(tempSprites, 72 + 47 + 20, 0, 48, 0);
+	showFrame(tempSprites, 72 + 19, 21, 47, 0);
+	showFrame(tempSprites, 160 + 23, 0, 48, 4);
+	showFrame(tempSprites, 160 + 71, 21, 47, 4);
+}
+
 } // End of namespace DreamGen