diff options
-rw-r--r-- | backends/PalmOS/Rsc/Resource.Frk/Starter.rsrc | bin | 24812 -> 24768 bytes | |||
-rw-r--r-- | backends/PalmOS/Rsc/StarterRsc.h | 7 | ||||
-rw-r--r-- | backends/PalmOS/Src/palmstart.cpp | 43 |
3 files changed, 23 insertions, 27 deletions
diff --git a/backends/PalmOS/Rsc/Resource.Frk/Starter.rsrc b/backends/PalmOS/Rsc/Resource.Frk/Starter.rsrc Binary files differindex 3380467944..54c36c3468 100644 --- a/backends/PalmOS/Rsc/Resource.Frk/Starter.rsrc +++ b/backends/PalmOS/Rsc/Resource.Frk/Starter.rsrc diff --git a/backends/PalmOS/Rsc/StarterRsc.h b/backends/PalmOS/Rsc/StarterRsc.h index 2304926982..12bcd872a7 100644 --- a/backends/PalmOS/Rsc/StarterRsc.h +++ b/backends/PalmOS/Rsc/StarterRsc.h @@ -1,8 +1,8 @@ -// Header generated by Constructor for Palm OS (R) 1.9 +// Header generated by Constructor for Palm OS (R) 1.8 // -// Generated at 10:32:32 on lundi 7 juillet 2003 +// Generated at 2:04:16 PM on Tuesday, July 22, 2003 // -// Generated for file: Starter.rsrc +// Generated for file: P:\Dev\Palm\scummvm_0.4.x_180703\backends\PalmOS\Rsc\Starter.rsrc // // THIS IS AN AUTOMATICALLY GENERATED HEADER FILE // DO NOT EDIT - CHANGES MADE TO THIS FILE WILL BE LOST @@ -27,7 +27,6 @@ #define AboutUnnamed1103Label 1103 //(Left Origin = 38, Top Origin = 61, Usable = 1, Font = Bold) #define AboutUnnamed1104Label 1104 //(Left Origin = 9, Top Origin = 104, Usable = 1, Font = Bold) #define AboutUnnamed1106Label 1106 //(Left Origin = 18, Top Origin = 114, Usable = 1, Font = Standard) -#define AboutVersionLabel 1107 //(Left Origin = 4, Top Origin = 141, Usable = 1, Font = Standard) #define AboutUnnamed1109Label 1109 //(Left Origin = 54, Top Origin = 71, Usable = 1, Font = Standard) #define AboutUnnamed1110Label 1110 //(Left Origin = 8, Top Origin = 81, Usable = 1, Font = Standard) #define AboutUnnamed1111Label 1111 //(Left Origin = 32, Top Origin = 39, Usable = 1, Font = Standard) diff --git a/backends/PalmOS/Src/palmstart.cpp b/backends/PalmOS/Src/palmstart.cpp index 77a3410c23..5403471f06 100644 --- a/backends/PalmOS/Src/palmstart.cpp +++ b/backends/PalmOS/Src/palmstart.cpp @@ -31,6 +31,7 @@ #include "scumm_globals.h" #include "extend.h" // for disable state #include "stdio.h" // used in checkPath +#include "engine.h" // scumm version strings #include "mathlib.h" #include "vibrate.h" @@ -284,6 +285,7 @@ static void SknCloseSkin(DmOpenRef skinDBP) { } /* static void SknSetPalette() { + UInt16 palIndex; ColorTableType *palTemp; MemHandle palH; @@ -293,7 +295,7 @@ static void SknSetPalette() { if (skinDBP) { palIndex = DmFindResource (skinDBP, colorTableRsc, skinPalette, NULL); - if (palIndex != (UInt16)-1) { + if (palIndex != 0xFFFF) { palH = DmGetResourceIndex(skinDBP, palIndex); if (palH) { @@ -306,6 +308,7 @@ static void SknSetPalette() { } SknCloseSkin(skinDBP); + } */ static void SknGetListColors(DmOpenRef skinDBP, DmResID resID, UInt8 *text, UInt8 *selected, UInt8 *background) { @@ -666,19 +669,6 @@ enum { ArwFDwn = 2, ArwDown = 3 }; -/* -//REMOVE -static struct { - Boolean disabled; - Boolean selected; -} iconState[6] = {0,0 ,0,0 ,0,0 ,1,0 ,0,0 ,0,0}; -//REMOVE -static struct { - UInt16 position; - UInt8 last; - Boolean disabled[4]; -} ArrowManager = {0, ArwNone, 0,0,0,0}; -*/ //############################################################################# //############################################################################# @@ -2100,7 +2090,7 @@ static void SknApplySkin() FormPtr frmP = FrmGetActiveForm(); WinScreenLock(winLockErase); -// SknSetPalette(); + //SknSetPalette(); FrmDrawForm(frmP); if (gPrefs->card.volRefNum != sysInvalidRefNum) @@ -2415,10 +2405,20 @@ static Boolean SkinsFormHandleEvent(EventPtr eventP) { return handled; } + +static void MainFormAbout() { + FormPtr frmP; + FormLabelType *versionP; + + frmP = FrmInitForm(AboutForm); + versionP = FrmNewLabel(&frmP, 1111, gScummVMVersion, 4, 142, stdFont); + FrmDoDialog (frmP); // Display the About Box. + FrmDeleteForm (frmP); +} + static Boolean MainFormDoCommand(UInt16 command) { Boolean handled = false; - FormPtr frmP; switch (command) { case MainGamesCard: @@ -2445,10 +2445,8 @@ static Boolean MainFormDoCommand(UInt16 command) break; case MainOptionsAbout: - frmP = FrmInitForm (AboutForm); - FrmDoDialog (frmP); // Display the About Box. - FrmDeleteForm (frmP); - handled = true; + MainFormAbout(); + handled = true; break; case MainOptionsVolumeControl: @@ -2864,6 +2862,7 @@ static Boolean penDownRepeat() { return handled; } + static Boolean MainFormHandleEvent(EventPtr eventP) { Boolean handled = false; @@ -2901,9 +2900,7 @@ static Boolean MainFormHandleEvent(EventPtr eventP) break; case MainAboutButton: - frmP = FrmInitForm (AboutForm); - FrmDoDialog (frmP); // Display the About Box. - FrmDeleteForm (frmP); + MainFormAbout(); break; // case MainListTypeSelTrigger: |