diff options
| author | D G Turner | 2011-12-25 07:42:04 +0000 |
|---|---|---|
| committer | D G Turner | 2011-12-25 07:42:04 +0000 |
| commit | 4bb6305e59a1b3aa6ff1135ba8660fede22ff0e8 (patch) | |
| tree | 2f54e29994b48a0012b5f127640d5aff18db1f2a | |
| parent | 088c145f8f551a7faaf50e317529549503b1b7e8 (diff) | |
| download | scummvm-rg350-4bb6305e59a1b3aa6ff1135ba8660fede22ff0e8.tar.gz scummvm-rg350-4bb6305e59a1b3aa6ff1135ba8660fede22ff0e8.tar.bz2 scummvm-rg350-4bb6305e59a1b3aa6ff1135ba8660fede22ff0e8.zip | |
DREAMWEB: Change hangOnPQ function signature to avoid carry flag usage.
| -rw-r--r-- | engines/dreamweb/stubs.h | 2 | ||||
| -rw-r--r-- | engines/dreamweb/talk.cpp | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index b1406182f0..bf5f5c54df 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 834109b1dc..f13f40e229 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() { |