[Scummvm-cvs-logs] scummvm master -> 27bc4f3f08680eff0423c74af8e98fd5b393bf17

tramboi bertrand_augereau at yahoo.fr
Mon Nov 14 15:19:40 CET 2011


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:
27bc4f3f08 DREAWMEB: 'showcity' ported to C++


Commit: 27bc4f3f08680eff0423c74af8e98fd5b393bf17
    https://github.com/scummvm/scummvm/commit/27bc4f3f08680eff0423c74af8e98fd5b393bf17
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-09-04T04:38:45-07:00

Commit Message:
DREAWMEB: 'showcity' ported to C++

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index cc3f7b2..0bce261 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -199,6 +199,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'usetext',
 	'bresenhams',
 	'sortoutmap',
+	'showcity',
 	'examineobtext',
 	'wornerror',
 	], skip_output = [
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 5f9712e..201d993 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -6377,23 +6377,6 @@ quittravel:
 	deallocatemem();
 }
 
-void DreamGenContext::showcity() {
-	STACK_CHECK;
-	clearwork();
-	ds = data.word(kTempgraphics);
-	di = 57;
-	bx = 32;
-	al = 0;
-	ah = 0;
-	showframe();
-	ds = data.word(kTempgraphics);
-	di = 120+57;
-	bx = 32;
-	al = 1;
-	ah = 0;
-	showframe();
-}
-
 void DreamGenContext::lookatplace() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 224);
@@ -16860,7 +16843,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_redes: redes(); break;
 		case addr_newplace: newplace(); break;
 		case addr_selectlocation: selectlocation(); break;
-		case addr_showcity: showcity(); break;
 		case addr_lookatplace: lookatplace(); break;
 		case addr_getundercentre: getundercentre(); break;
 		case addr_putundercentre: putundercentre(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 3da4e71..b91bc54 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -414,7 +414,6 @@ public:
 	static const uint16 addr_putundercentre = 0xc4b8;
 	static const uint16 addr_getundercentre = 0xc4b4;
 	static const uint16 addr_lookatplace = 0xc4b0;
-	static const uint16 addr_showcity = 0xc4ac;
 	static const uint16 addr_selectlocation = 0xc4a8;
 	static const uint16 addr_newplace = 0xc4a4;
 	static const uint16 addr_redes = 0xc4a0;
@@ -1537,7 +1536,7 @@ public:
 	void dumpsymbox();
 	void loadgame();
 	void getridoftemp();
-	void showcity();
+	//void showcity();
 	void dumpsymbol();
 	void disablepath();
 	void buttonsix();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 93688bf..674bc49 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1892,5 +1892,12 @@ void DreamGenContext::sortoutmap() {
 	}
 }
 
+void DreamGenContext::showcity() {
+	clearwork();
+	Frame *tempGraphics = (Frame *)segRef(data.word(kTempgraphics)).ptr(0, 0);
+	showframe(tempGraphics, 57, 32, 0, 0);
+	showframe(tempGraphics, 120+57, 32, 1, 0);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 3e928fe..26b2534 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -247,4 +247,5 @@
 	void bresenhams();
 	void examineobtext();
 	void sortoutmap();
+	void showcity();
 






More information about the Scummvm-git-logs mailing list