[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.3,1.4 sky.cpp,1.64,1.65
Max Horn
fingolfin at users.sourceforge.net
Fri Jun 27 06:24:03 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv14638
Modified Files:
control.cpp sky.cpp
Log Message:
fixed warnings
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- control.cpp 27 Jun 2003 02:54:05 -0000 1.3
+++ control.cpp 27 Jun 2003 13:23:01 -0000 1.4
@@ -427,10 +427,13 @@
bool SkyControl::getYesNo(void) {
- _yesNo->drawToScreen(WITH_MASK);
- bool retVal; bool quitPanel = false;
+ bool retVal = false;
+ bool quitPanel = false;
uint8 mouseType = MOUSE_NORMAL;
uint8 wantMouse = MOUSE_NORMAL;
+
+ _yesNo->drawToScreen(WITH_MASK);
+
while (!quitPanel) {
if (mouseType != wantMouse) {
mouseType = wantMouse;
@@ -442,15 +445,19 @@
if ((_mouseX >= 77) && (_mouseX <= 114)) { // over 'yes'
wantMouse = MOUSE_CROSS;
if (_mouseClicked) {
- quitPanel = true; retVal = true;
+ quitPanel = true;
+ retVal = true;
}
} else if ((_mouseX >= 156) && (_mouseX <= 193)) { // over 'no'
wantMouse = MOUSE_CROSS;
if (_mouseClicked) {
- quitPanel = true; retVal = false;
+ quitPanel = true;
+ retVal = false;
}
- } else wantMouse = MOUSE_NORMAL;
- } else wantMouse = MOUSE_NORMAL;
+ } else
+ wantMouse = MOUSE_NORMAL;
+ } else
+ wantMouse = MOUSE_NORMAL;
}
return retVal;
}
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- sky.cpp 27 Jun 2003 02:54:05 -0000 1.64
+++ sky.cpp 27 Jun 2003 13:23:01 -0000 1.65
@@ -54,7 +54,7 @@
void **SkyState::_itemList[300];
-SystemVars SkyState::_systemVars = {0, 0, 0, 0, 4316};
+SystemVars SkyState::_systemVars = {0, 0, 0, 0, 4316, 0};
SkyState::SkyState(GameDetector *detector, OSystem *syst)
: Engine(detector, syst) {
More information about the Scummvm-git-logs
mailing list