[Scummvm-cvs-logs] scummvm master -> b7eb5eff3813cf2784c834e48f99d3192d72ea52
wjp
wjp at usecode.org
Sun Nov 20 19:58:01 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:
b7eb5eff38 DREAMWEB: Reduce code duplication
Commit: b7eb5eff3813cf2784c834e48f99d3192d72ea52
https://github.com/scummvm/scummvm/commit/b7eb5eff3813cf2784c834e48f99d3192d72ea52
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-20T10:57:06-08:00
Commit Message:
DREAMWEB: Reduce code duplication
Changed paths:
engines/dreamweb/stubs.cpp
engines/dreamweb/stubs.h
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index d520307..2bfa384 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -213,41 +213,52 @@ void DreamGenContext::screenupdate() {
if (quitRequested())
return;
animpointer();
+
showpointer();
if ((data.word(kWatchingtime) == 0) && (data.byte(kNewlocation) != 0xff))
return;
vsync();
- readmouse1();
+ uint16 mouseState = 0;
+ mouseState |= readMouseState();
dumppointer();
+
dumptextline();
delpointer();
autolook();
spriteupdate();
watchcount();
zoom();
+
showpointer();
if (data.byte(kWongame))
return;
vsync();
- readmouse2();
+ mouseState |= readMouseState();
dumppointer();
+
dumpzoom();
delpointer();
deleverything();
printsprites();
reelsonscreen();
afternewroom();
+
showpointer();
vsync();
- readmouse3();
+ mouseState |= readMouseState();
dumppointer();
+
dumpmap();
dumptimedtext();
delpointer();
+
showpointer();
vsync();
- readmouse4();
+ data.word(kOldbutton) = data.word(kMousebutton);
+ mouseState |= readMouseState();
+ data.word(kMousebutton) = mouseState;
dumppointer();
+
dumpwatch();
delpointer();
}
@@ -270,18 +281,9 @@ void DreamGenContext::startup() {
void DreamGenContext::startup1() {
clearpalette();
data.byte(kThroughdoor) = 0;
- data.byte(kCurrentkey) = '0';
- data.byte(kMainmode) = 0;
- createpanel();
- data.byte(kNewobs) = 1;
- drawfloor();
- showicon();
- getunderzoom();
- spriteupdate();
- printsprites();
- undertextline();
- reelsonscreen();
- atmospheres();
+
+ startup();
+
worktoscreen();
fadescreenup();
}
@@ -454,54 +456,18 @@ void DreamGenContext::mousecall() {
void DreamGenContext::readmouse() {
data.word(kOldbutton) = data.word(kMousebutton);
- data.word(kOldx) = data.word(kMousex);
- data.word(kOldy) = data.word(kMousey);
- uint16 x, y, state;
- engine->mouseCall(&x, &y, &state);
- data.word(kMousex) = x;
- data.word(kMousey) = y;
+ uint16 state = readMouseState();
data.word(kMousebutton) = state;
}
-void DreamGenContext::readmouse1() {
- data.word(kOldx) = data.word(kMousex);
- data.word(kOldy) = data.word(kMousey);
- uint16 x, y, state;
- engine->mouseCall(&x, &y, &state);
- data.word(kMousex) = x;
- data.word(kMousey) = y;
- data.word(kMousebutton1) = state;
-}
-
-void DreamGenContext::readmouse2() {
- data.word(kOldx) = data.word(kMousex);
- data.word(kOldy) = data.word(kMousey);
- uint16 x, y, state;
- engine->mouseCall(&x, &y, &state);
- data.word(kMousex) = x;
- data.word(kMousey) = y;
- data.word(kMousebutton2) = state;
-}
-
-void DreamGenContext::readmouse3() {
- data.word(kOldx) = data.word(kMousex);
- data.word(kOldy) = data.word(kMousey);
- uint16 x, y, state;
- engine->mouseCall(&x, &y, &state);
- data.word(kMousex) = x;
- data.word(kMousey) = y;
- data.word(kMousebutton3) = state;
-}
-
-void DreamGenContext::readmouse4() {
- data.word(kOldbutton) = data.word(kMousebutton);
+uint16 DreamGenContext::readMouseState() {
data.word(kOldx) = data.word(kMousex);
data.word(kOldy) = data.word(kMousey);
uint16 x, y, state;
engine->mouseCall(&x, &y, &state);
data.word(kMousex) = x;
data.word(kMousey) = y;
- data.word(kMousebutton) = state | data.word(kMousebutton1) | data.word(kMousebutton2) | data.word(kMousebutton3);
+ return state;
}
void DreamGenContext::setmouse() {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 29f888c..3aedb10 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -222,10 +222,7 @@
void checkcoords();
void checkcoords(const RectWithCallback *rectWithCallbacks);
void readmouse();
- void readmouse1();
- void readmouse2();
- void readmouse3();
- void readmouse4();
+ uint16 readMouseState();
uint16 waitframes();
void drawflags();
void addtopeoplelist();
More information about the Scummvm-git-logs
mailing list