[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src palmstart.cpp,1.11,1.12

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1:/tmp/cvs-serv9543/Src

Modified Files:
	palmstart.cpp 
Log Message:
Use ScummVM version strings in about form

Index: palmstart.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palmstart.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- palmstart.cpp	15 Jul 2003 10:31:25 -0000	1.11
+++ palmstart.cpp	22 Jul 2003 12:23:14 -0000	1.12
@@ -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 SknSetPalette() {
+
 	UInt16 palIndex;
 	ColorTableType *palTemp;
 	MemHandle palH;
@@ -293,7 +295,7 @@
 	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 @@
 	}
 	
 	SknCloseSkin(skinDBP);
+
 }
 */
 static void SknGetListColors(DmOpenRef skinDBP, DmResID resID, UInt8 *text, UInt8 *selected, UInt8 *background) {
@@ -666,19 +669,6 @@
 	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 @@
 	FormPtr frmP = FrmGetActiveForm();
 
 	WinScreenLock(winLockErase);
-//	SknSetPalette();
+	//SknSetPalette();
 	FrmDrawForm(frmP);
 
 	if (gPrefs->card.volRefNum != sysInvalidRefNum)
@@ -2415,10 +2405,20 @@
 	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 @@
 			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 @@
 	return handled;
 }
 
+
 static Boolean MainFormHandleEvent(EventPtr eventP)
 {
 	Boolean handled = false;
@@ -2901,9 +2900,7 @@
 					break;
 			
 				case MainAboutButton:
-					frmP = FrmInitForm (AboutForm);
-					FrmDoDialog (frmP);					// Display the About Box.
-					FrmDeleteForm (frmP);
+					MainFormAbout();
 					break;
 				
 //				case MainListTypeSelTrigger: