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

tramboi bertrand_augereau at yahoo.fr
Sat Nov 26 14:45:31 CET 2011


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

Summary:
842184d5c5 DREAMWEB: 'usetempcharset' and 'usecharset1' ported to C++
f7fdb0d4b7 DREAMWEB: 'disablepath' is not needed


Commit: 842184d5c58dc4f09f4d29ae050252c23bf73949
    https://github.com/scummvm/scummvm/commit/842184d5c58dc4f09f4d29ae050252c23bf73949
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-26T07:37:11-08:00

Commit Message:
DREAMWEB: 'usetempcharset' and 'usecharset1' 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 b94c358..e862099 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -281,6 +281,8 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'onedigit',
 	'showword',
 	'convnum',
+	'usecharset1',
+	'usetempcharset',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index a3cafdb..63c014d 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -12775,18 +12775,6 @@ void DreamGenContext::showman() {
 	showframe();
 }
 
-void DreamGenContext::usecharset1() {
-	STACK_CHECK;
-	ax = data.word(kCharset1);
-	data.word(kCurrentset) = ax;
-}
-
-void DreamGenContext::usetempcharset() {
-	STACK_CHECK;
-	ax = data.word(kTempcharset);
-	data.word(kCurrentset) = ax;
-}
-
 void DreamGenContext::showexit() {
 	STACK_CHECK;
 	ds = data.word(kIcons1);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7c169e5..fc0b7fa 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -79,8 +79,6 @@ public:
 	static const uint16 addr_gettime = 0xca8c;
 	static const uint16 addr_panelicons1 = 0xca84;
 	static const uint16 addr_showexit = 0xca80;
-	static const uint16 addr_usetempcharset = 0xca7c;
-	static const uint16 addr_usecharset1 = 0xca78;
 	static const uint16 addr_showman = 0xca6c;
 	static const uint16 addr_middlepanel = 0xca68;
 	static const uint16 addr_workoutframes = 0xca54;
@@ -1396,7 +1394,7 @@ public:
 	void locklighton();
 	void useladderb();
 	//void spriteupdate();
-	void usetempcharset();
+	//void usetempcharset();
 	void discops();
 	//void printdirect();
 	//void delthisone();
@@ -1779,7 +1777,7 @@ public:
 	void tattooman();
 	void usehandle();
 	void openfile();
-	void usecharset1();
+	//void usecharset1();
 	//void makenextblock();
 	void showpuztext();
 	//void addalong();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 028b5fc..cdc692f 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2308,5 +2308,13 @@ void DreamGenContext::dolook() {
 	worktoscreenm();
 }
 
+void DreamGenContext::usecharset1() {
+	data.word(kCurrentset) = data.word(kCharset1);
+}
+
+void DreamGenContext::usetempcharset() {
+	data.word(kCurrentset) = data.word(kTempcharset);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a53f1bb..92917f7 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -335,4 +335,7 @@
 	void look();
 	void autolook();
 	void dolook();
+	void usetempcharset();
+	void usecharset1();
+
 


Commit: f7fdb0d4b7ec9064c24dc892ffe7c237f98b973e
    https://github.com/scummvm/scummvm/commit/f7fdb0d4b7ec9064c24dc892ffe7c237f98b973e
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-26T07:41:40-08:00

Commit Message:
DREAMWEB: 'disablepath' is not needed

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index e862099..22ef79f 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -283,6 +283,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'convnum',
 	'usecharset1',
 	'usetempcharset',
+	'disablepath',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 63c014d..0b9b897 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -13123,40 +13123,6 @@ void DreamGenContext::restoreall() {
 	setallchanges();
 }
 
-void DreamGenContext::disablepath() {
-	STACK_CHECK;
-	push(cx);
-	_xchg(al, ah);
-	cx = -6;
-looky2:
-	_add(cx, 6);
-	_sub(al, 10);
-	if (!flags.c())
-		goto looky2;
-	al = ah;
-	_dec(cx);
-lookx2:
-	_inc(cx);
-	_sub(al, 11);
-	if (!flags.c())
-		goto lookx2;
-	al = cl;
-	ah = 0;
-	cx = 144;
-	_mul(cx);
-	es = data.word(kReels);
-	bx = (0);
-	_add(bx, ax);
-	ax = pop();
-	ah = 0;
-	_add(ax, ax);
-	_add(ax, ax);
-	_add(ax, ax);
-	_add(bx, ax);
-	al = 0;
-	es.byte(bx+6) = al;
-}
-
 void DreamGenContext::allocateload() {
 	STACK_CHECK;
 	push(es);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index fc0b7fa..ebbd2c4 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -56,7 +56,6 @@ public:
 	static const uint16 addr_getridoftemp = 0xcb70;
 	static const uint16 addr_allocateload = 0xcb68;
 	static const uint16 addr_dontloadseg = 0xcb64;
-	static const uint16 addr_disablepath = 0xcb50;
 	static const uint16 addr_restoreall = 0xcb44;
 	static const uint16 addr_restorereels = 0xcb40;
 	static const uint16 addr_getridofall = 0xcb3c;
@@ -1209,7 +1208,7 @@ public:
 	void mainscreen();
 	void watchreel();
 	void showfolder();
-	//void turnanypathoff();
+	void showslots();
 	void openfilefromc();
 	void gettime();
 	//void clearwork();
@@ -1227,7 +1226,7 @@ public:
 	//void clearendpal();
 	void findtext1();
 	void isryanholding();
-	void showslots();
+	void interupttest();
 	void usecashcard();
 	void usewall();
 	void opentomb();
@@ -1358,7 +1357,6 @@ public:
 	//void isitdescribed();
 	void hotelbell();
 	void loadspeech();
-	void interupttest();
 	//void cls();
 	//void printsprites();
 	//void checkifperson();
@@ -1455,7 +1453,7 @@ public:
 	void getridoftemp();
 	//void showcity();
 	void dumpsymbol();
-	void disablepath();
+	//void disablepath();
 	//void convicons();
 	void buttonsix();
 	void intro2text();
@@ -1486,6 +1484,7 @@ public:
 	void loadsavebox();
 	void soundend();
 	void redes();
+	//void turnanypathoff();
 	void errormessage1();
 	void clearchanges();
 	void errormessage3();






More information about the Scummvm-git-logs mailing list