[Scummvm-cvs-logs] scummvm master -> 6c9ad26f1deff4cca56c462f74374c8ff100ac76

wjp wjp at usecode.org
Wed Nov 16 21:54:43 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:
304617db88 DREAMWEB: Add subtitles+speech FIXME
6c9ad26f1d DREAMWEB: Comment and clean up twodigitnum


Commit: 304617db88d50389e2239756abd924378b88d655
    https://github.com/scummvm/scummvm/commit/304617db88d50389e2239756abd924378b88d655
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-16T12:39:34-08:00

Commit Message:
DREAMWEB: Add subtitles+speech FIXME

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 44f0b87..01b4843 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -432,6 +432,10 @@ void DreamGenContext::setuptimedtemp(uint8 textIndex, uint8 voiceIndex, uint8 x,
 		cx = pop();
 		bx = pop();
 		ax = pop();
+
+		// FIXME: This fallthrough does not properly support subtitles+speech
+		// mode. The parameters to setuptimedtemp() are sometimes different
+		// for speech and for subtitles. See e.g., madmantext()
 		if ((data.byte(kSpeechloaded) == 1) && (data.byte(kSubtitles) != 1))
 			return;
 	}


Commit: 6c9ad26f1deff4cca56c462f74374c8ff100ac76
    https://github.com/scummvm/scummvm/commit/6c9ad26f1deff4cca56c462f74374c8ff100ac76
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-16T12:53:50-08:00

Commit Message:
DREAMWEB: Comment and clean up twodigitnum

Changed paths:
    engines/dreamweb/stubs.cpp
    engines/dreamweb/stubs.h



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 01b4843..6292882 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2020,21 +2020,19 @@ void DreamGenContext::loadroom() {
 	getdimension();
 }
 
-void DreamGenContext::twodigitnum(uint8 in1, uint8 in2, uint8 *out1, uint8 *out2) {
-	*out1 = in1;
-	*out2 = in2;
-	while (*out1 >= 10) {
-		++(*out2);
-		*out1 -= 10;
-	}
-	*out1 += in2;
+void DreamGenContext::twodigitnum(uint8 num, uint8 baseChar,
+                                  uint8 &digit1, uint8 &digit2) {
+	digit1 = baseChar + num/10;
+	digit2 = baseChar + num%10;
 }
 
+// Convert a number between 0 and 99 into its two digits, either
+// ASCII (if cl/basechar == '0'), or raw (if cl/basechar == 0).
 void DreamGenContext::twodigitnum() {
-	uint8 out1, out2;
-	twodigitnum(al, cl, &out1, &out2);
-	al = out1;
-	ah = out2;
+	uint8 digit1, digit2;
+	twodigitnum(al, cl, digit1, digit2);
+	ah = digit1;
+	al = digit2;
 }
 
 } /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 313c2f2..dde3193 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -272,6 +272,6 @@
 	void putundermenu();
 	void textformonk();
 	void textforend();
-	void twodigitnum(uint8 in1, uint8 in2, uint8 *out1, uint8 *out2);
+	void twodigitnum(uint8 num, uint8 baseChar, uint8 &digit1, uint8 &digit2);
 	void twodigitnum();
 






More information about the Scummvm-git-logs mailing list