[Scummvm-cvs-logs] scummvm master -> 049a0c25d73114f76bb2107c6211dd01306df131
wjp
wjp at usecode.org
Sat Nov 19 18:48:45 CET 2011
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:
049a0c25d7 DREAMWEB: Minor cleanup
Commit: 049a0c25d73114f76bb2107c6211dd01306df131
https://github.com/scummvm/scummvm/commit/049a0c25d73114f76bb2107c6211dd01306df131
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-19T09:47:54-08:00
Commit Message:
DREAMWEB: Minor cleanup
Changed paths:
engines/dreamweb/stubs.cpp
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1288cc4..7e2e185 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1883,8 +1883,9 @@ void DreamGenContext::hangonp(uint16 count) {
showpointer();
vsync();
dumppointer();
- uint32 counter = count; // silence a signed/unsigned MSVC warning below
- for (uint32 i = 0; i < counter * 3; ++i) {
+
+ count *= 3;
+ for (uint16 i = 0; i < count; ++i) {
delpointer();
readmouse();
animpointer();
@@ -1893,9 +1894,7 @@ void DreamGenContext::hangonp(uint16 count) {
dumppointer();
if (data.byte(kQuitrequested))
break;
- if (data.word(kMousebutton) == 0)
- continue;
- if (data.word(kMousebutton) != data.word(kOldbutton))
+ if (data.word(kMousebutton) != 0 && data.word(kMousebutton) != data.word(kOldbutton))
break;
}
More information about the Scummvm-git-logs
mailing list