[Scummvm-cvs-logs] scummvm master -> 63e436d723fb4d53d52b892af74a5ca9b8c2535d

[tramboi]

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:
5783a303b9 DREAMWEB: 'madmode' ported to C++
63e436d723 DREAMWEB: Bugfix (introduced with porting)


Commit: 5783a303b90255be3d8d8b354c7bdb2c10a7e46f
    https://github.com/scummvm/scummvm/commit/5783a303b90255be3d8d8b354c7bdb2c10a7e46f
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-08-15T19:26:27-07:00

Commit Message:
DREAMWEB: 'madmode' ported to C++

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 376e2dc..937a8eb 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -113,6 +113,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'showpanel',
 	'updatepeople',
 	'madmantext',
+	'madmode',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 34bb64b..782de3c 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1694,19 +1694,6 @@ notendtelly:
 	showgamereel();
 }
 
-void DreamGenContext::madmode() {
-	STACK_CHECK;
-	data.word(kWatchingtime) = 2;
-	data.byte(kPointermode) = 0;
-	_cmp(data.byte(kCombatcount), 65);
-	if (flags.c())
-		return /* (iswatchmad) */;
-	_cmp(data.byte(kCombatcount), 70);
-	if (!flags.c())
-		return /* (iswatchmad) */;
-	data.byte(kPointermode) = 2;
-}
-
 void DreamGenContext::priesttext() {
 	STACK_CHECK;
 	_cmp(es.word(bx+3), 2);
@@ -19069,7 +19056,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_priest: priest(); break;
 		case addr_madmanstelly: madmanstelly(); break;
 		case addr_madman: madman(); break;
-		case addr_madmode: madmode(); break;
 		case addr_priesttext: priesttext(); break;
 		case addr_textforend: textforend(); break;
 		case addr_textformonk: textformonk(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index be3c122..3a19f81 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -654,7 +654,6 @@ public:
 	static const uint16 addr_textformonk = 0xc0f0;
 	static const uint16 addr_textforend = 0xc0ec;
 	static const uint16 addr_priesttext = 0xc0e8;
-	static const uint16 addr_madmode = 0xc0e4;
 	static const uint16 addr_madman = 0xc0dc;
 	static const uint16 addr_madmanstelly = 0xc0d8;
 	static const uint16 addr_priest = 0xc0d4;
@@ -1806,7 +1805,7 @@ public:
 	void textforend();
 	void showdiarykeys();
 	void dontloadseg();
-	void madmode();
+	//void madmode();
 	void intro3text();
 	void allocatemem();
 	void sortoutmap();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 0da5faa..971a52f 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -846,5 +846,15 @@ void DreamGenContext::madman() {
 	madmode();
 }
 
+void DreamGenContext::madmode() {
+	data.word(kWatchingtime) = 2;
+	data.byte(kPointermode) = 0;
+	if (data.byte(kCombatcount) < (isCD() ? 65 : 63))
+		return;
+	if (data.byte(kCombatcount) >= (isCD() ? 70 : 68))
+		return;
+	data.byte(kPointermode) = 2;
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 81fbf0e..7e7d97e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -129,5 +129,6 @@
 	void showpanel();
 	void updatepeople();
 	void madmantext();
+	void madmode();
 	bool isCD();
 


Commit: 63e436d723fb4d53d52b892af74a5ca9b8c2535d
    https://github.com/scummvm/scummvm/commit/63e436d723fb4d53d52b892af74a5ca9b8c2535d
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-08-15T19:55:20-07:00

Commit Message:
DREAMWEB: Bugfix (introduced with porting)

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index c7c78e3..2ea9779 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -879,6 +879,7 @@ void DreamGenContext::dealwithspecial(uint8 firstParam, uint8 secondParam) {
 	} else if (type == 6) {
 		data.byte(kNewlocation) = secondParam;
 	} else {
+		ah = secondParam;
 		movemap();
 	}
 }