[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src app.cpp,1.8,1.9
Chris Apers
chrilith at users.sourceforge.net
Fri Dec 10 08:01:08 CET 2004
Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6514
Modified Files:
app.cpp
Log Message:
- cleanup
- move notification init after screenSize to prevent another DIA madness
Index: app.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/app.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- app.cpp 9 Nov 2004 11:32:00 -0000 1.8
+++ app.cpp 10 Dec 2004 16:00:21 -0000 1.9
@@ -196,14 +196,11 @@
void PINGetScreenDimensions() {
UInt32 ftr;
-
- gVars->pinUpdate = false;
-
// if feature set, not set on Garmin iQue3600 ???
if (!(FtrGet(sysFtrCreator, sysFtrNumInputAreaFlags, &ftr))) {
if (ftr & grfFtrInputAreaFlagCollapsible) {
- RectangleType r;
+ Coord x, y;
UInt16 curOrientation = SysGetOrientation();
OPTIONS_SET(kOptCollapsible);
@@ -215,9 +212,9 @@
PINSetInputAreaState(pinInputAreaClosed);
StatHide();
- WinGetBounds(WinGetDisplayWindow(), &r);
- gVars->screenFullWidth = r.extent.x << 1;
- gVars->screenFullHeight = r.extent.y << 1;
+ WinGetDisplayExtent(&x, &y);
+ gVars->screenFullWidth = x << 1;
+ gVars->screenFullHeight = y << 1;
OPTIONS_SET(kOptModeWide);
@@ -231,8 +228,6 @@
PINSetInputTriggerState(pinInputTriggerDisabled);
}
}
-
- gVars->pinUpdate = true;
}
static void AppStartCheckScreenSize() {
@@ -249,7 +244,6 @@
slkRefNum = SilkInit(&version);
gVars->slkRefNum = slkRefNum;
gVars->slkVersion = version;
-
if (slkRefNum != sysInvalidRefNum) {
if (version == vskVersionNum1) {
SilkLibEnableResize(slkRefNum);
@@ -335,7 +329,6 @@
gVars->HRrefNum = sysInvalidRefNum;
gVars->volRefNum = sysInvalidRefNum;
gVars->slkRefNum = sysInvalidRefNum;
- gVars->skinSet = false;
gVars->options = kOptNone;
#ifndef DISABLE_TAPWAVE
@@ -427,8 +420,8 @@
if (error) return (error);
GamImportDatabase();
- AppStartCheckNotify(); // not fatal error if not avalaible
AppStartCheckScreenSize();
+ AppStartCheckNotify(); // not fatal error if not avalaible
AppStartSetMemory(); // set memory required by the differents engines
// force ARM option if bDirectMode
More information about the Scummvm-git-logs
mailing list