[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src app.cpp,1.9,1.10
Chris Apers
chrilith at users.sourceforge.net
Fri Dec 10 08:12:03 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src app.cpp,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 logic.cpp,1.46,1.47 sword1.cpp,1.72,1.73 sword1.h,1.22,1.23 sworddefs.h,1.16,1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9012
Modified Files:
app.cpp
Log Message:
Use the new init functions
Index: app.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/app.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- app.cpp 10 Dec 2004 16:00:21 -0000 1.9
+++ app.cpp 10 Dec 2004 16:11:16 -0000 1.10
@@ -17,6 +17,7 @@
#include "modules.h"
#include "init_mathlib.h"
#include "init_sony.h"
+#include "init_palmos.h"
#ifndef DISABLE_TAPWAVE
#define __TWKEYS_H__
@@ -40,67 +41,24 @@
***********************************************************************/
static Err AppStartCheckHRmode()
{
- SonySysFtrSysInfoP sonySysFtrSysInfoP;
- Err error = errNone;
-
- // test if sonyHR is present
- if (!(error = FtrGet(sonySysFtrCreator, sonySysFtrNumSysInfoP, (UInt32*)&sonySysFtrSysInfoP))) {
- if (sonySysFtrSysInfoP->libr & sonySysFtrSysInfoLibrHR) { // HR available
-
- if ((error = SysLibFind(sonySysLibNameHR, &gVars->HRrefNum)))
- if (error == sysErrLibNotFound) // couldn't find lib
- error = SysLibLoad( 'libr', sonySysFileCHRLib, &gVars->HRrefNum);
-
- if (!error) { // Now we can use HR lib. Executes Open library.
- error = HROpen(gVars->HRrefNum);
- OPTIONS_SET(kOptDeviceClie);
- }
- }
- }
- // if not, Hi-Density ?
- if (error) {
- gVars->HRrefNum = sysInvalidRefNum; // Not sony HR
- OPTIONS_RST(kOptDeviceClie);
- error = (OPTIONS_TST(kOptModeHiDensity) == 0);
- }
-
- if (!error) { // Not, error processing
- UInt32 width, height, depth;
- Boolean color;
-
- width = hrWidth;
- height= hrHeight;
- depth = (OPTIONS_TST(kOptMode16Bit) && OPTIONS_TST(kOptDeviceOS5)) ? 16 : 8;
- color = true;
+ Err e = errNone;
+ UInt32 depth = (OPTIONS_TST(kOptMode16Bit) && OPTIONS_TST(kOptDeviceOS5)) ? 16 : 8;
- if (gVars->HRrefNum != sysInvalidRefNum) {
- error = HRWinScreenMode (gVars->HRrefNum, winScreenModeSet, &width, &height, &depth, &color);
- } else {
- error = WinScreenMode (winScreenModeSet, &width, &height, &depth, &color);
-
- // check if we are now in hi-density
- if (!error) {
- UInt32 attr;
- WinScreenGetAttribute(winScreenDensity, &attr);
- error = (attr != kDensityDouble);
- }
- }
+ // try to init Sony HR mode then Palm HR mode
+ gVars->HRrefNum = SonyHRInit(depth);
- // high-resolution mode entered from here if no error
- if (error != errNone)
+ if (gVars->HRrefNum == sysInvalidRefNum)
+ if (e = PalmHRInit(depth))
FrmCustomAlert(FrmErrorAlert,"Your device doesn't seem to support Hi-Res or 256color mode.",0,0);
- }
- else
- FrmCustomAlert(FrmErrorAlert,"This device doesn't seem to support\nHi-Res mode.",0,0);
- return error;
+ return e;
}
static void AppStopHRMode() {
- if (gVars->HRrefNum != sysInvalidRefNum) {
- HRClose(gVars->HRrefNum);
- //SysLibRemove(gVars->HRrefNum); // never call this !!
- }
+ if (gVars->HRrefNum != sysInvalidRefNum)
+ SonyHRRelease(gVars->HRrefNum);
+ else
+ PalmHRRelease();
}
static Err AppStartCheckNotify() {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src app.cpp,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 logic.cpp,1.46,1.47 sword1.cpp,1.72,1.73 sword1.h,1.22,1.23 sworddefs.h,1.16,1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list