[Scummvm-cvs-logs] scummvm master -> 79be8a541bd014abe9aa011b0e9f12768a370efd

tramboi bertrand_augereau at yahoo.fr
Thu Nov 17 22:21:11 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:
79be8a541b DREAMWEB: 'loadtempcharset' ported to C++


Commit: 79be8a541bd014abe9aa011b0e9f12768a370efd
    https://github.com/scummvm/scummvm/commit/79be8a541bd014abe9aa011b0e9f12768a370efd
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-17T15:14:30-08:00

Commit Message:
DREAMWEB: 'loadtempcharset' 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 3d8c9db..fddf64b 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -237,6 +237,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'loadintotemp',
 	'loadintotemp2',
 	'loadintotemp3',
+	'loadtempcharset',
 	'loadroomssample',
 	], skip_output = [
 	# These functions are processed but not output
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 988fe0c..41c91a5 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -14098,12 +14098,6 @@ void DreamGenContext::loadtraveltext() {
 	data.word(kTraveltext) = ax;
 }
 
-void DreamGenContext::loadtempcharset() {
-	STACK_CHECK;
-	standardload();
-	data.word(kTempcharset) = ax;
-}
-
 void DreamGenContext::loadtemptext() {
 	STACK_CHECK;
 	standardload();
@@ -16027,7 +16021,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_randomnum1: randomnum1(); break;
 		case addr_randomnum2: randomnum2(); break;
 		case addr_loadtraveltext: loadtraveltext(); break;
-		case addr_loadtempcharset: loadtempcharset(); break;
 		case addr_loadtemptext: loadtemptext(); break;
 		case addr_getridofreels: getridofreels(); break;
 		case addr_getridofall: getridofall(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index aa46eeb..281a92b 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -64,7 +64,6 @@ public:
 	static const uint16 addr_getridofall = 0xcb3c;
 	static const uint16 addr_getridofreels = 0xcb38;
 	static const uint16 addr_loadtemptext = 0xcb2c;
-	static const uint16 addr_loadtempcharset = 0xcb24;
 	static const uint16 addr_loadtraveltext = 0xcb14;
 	static const uint16 addr_randomnum2 = 0xcb08;
 	static const uint16 addr_randomnum1 = 0xcb04;
@@ -1354,7 +1353,7 @@ public:
 	void findfirstpath();
 	//void cancelch1();
 	void loadold();
-	void loadtempcharset();
+	//void loadtempcharset();
 	void useslab();
 	void dumpzoom();
 	//void aboutturn();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 086688a..ce25a92 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -246,6 +246,14 @@ void DreamGenContext::loadintotemp3(const char *fileName) {
 	data.word(kTempgraphics3) = standardload(fileName);
 }
 
+void DreamGenContext::loadtempcharset() {
+	loadtempcharset((const char *)cs.ptr(dx, 0));
+}
+
+void DreamGenContext::loadtempcharset(const char *fileName) {
+	data.word(kTempcharset) = standardload(fileName);
+}
+
 void DreamGenContext::seecommandtail() {
 	data.word(kSoundbaseadd) = 0x220;
 	data.byte(kSoundint) = 5;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 47b4094..ff8d597 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -31,6 +31,8 @@
 	void loadintotemp(const char *fileName);
 	void loadintotemp2(const char *fileName);
 	void loadintotemp3(const char *fileName);
+	void loadtempcharset();
+	void loadtempcharset(const char *fileName);
 	void multidump();
 	void multidump(uint16 x, uint16 y, uint8 width, uint8 height);
 	void frameoutv(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y);






More information about the Scummvm-git-logs mailing list