[Scummvm-cvs-logs] scummvm master -> 4bb6305e59a1b3aa6ff1135ba8660fede22ff0e8

[digitall]

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:
4bb6305e59 DREAMWEB: Change hangOnPQ function signature to avoid carry flag usage.


Commit: 4bb6305e59a1b3aa6ff1135ba8660fede22ff0e8
    https://github.com/scummvm/scummvm/commit/4bb6305e59a1b3aa6ff1135ba8660fede22ff0e8
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-24T23:42:04-08:00

Commit Message:
DREAMWEB: Change hangOnPQ function signature to avoid carry flag usage.

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



diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index b140618..bf5f5c5 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -173,7 +173,7 @@
 	void madmanRun();
 	void decide();
 	void talk();
-	void hangOnPQ();
+	bool hangOnPQ();
 	void showGun();
 	void endGame();
 	void newPlace();
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 834109b..f13f40e 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -173,8 +173,7 @@ void DreamGenContext::doSomeTalk() {
 		data.byte(kPointermode) = 3;
 		workToScreenM();
 		cx = 180;
-		hangOnPQ();
-		if (flags.c())
+		if (hangOnPQ())
 			return;
 
 		data.byte(kTalkpos)++;
@@ -213,8 +212,7 @@ void DreamGenContext::doSomeTalk() {
 			data.byte(kPointermode) = 3;
 			workToScreenM();
 			cx = 180;
-			hangOnPQ();
-			if (flags.c())
+			if (hangOnPQ())
 				return;
 		}
 
@@ -222,7 +220,7 @@ void DreamGenContext::doSomeTalk() {
 	}
 }
 
-void DreamGenContext::hangOnPQ() {
+bool DreamGenContext::hangOnPQ() {
 	data.byte(kGetback) = 0;
 
 	RectWithCallback<DreamBase> quitList[] = {
@@ -248,8 +246,7 @@ void DreamGenContext::hangOnPQ() {
 			delPointer();
 			data.byte(kPointermode) = 0;
 			cancelCh1();
-			flags._c = true;
-			return;
+			return true;
 		}
 
 		if (data.byte(kSpeechloaded) == 1 && data.byte(kCh1playing) == 255) {
@@ -261,7 +258,7 @@ void DreamGenContext::hangOnPQ() {
 
 	delPointer();
 	data.byte(kPointermode) = 0;
-	flags._c = false;
+	return false;
 }
 
 void DreamGenContext::redes() {