[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src globals.h,1.12,1.13

Chris Apers chrilith at users.sourceforge.net
Sun Sep 12 06:30:00 CEST 2004


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8402

Modified Files:
	globals.h 
Log Message:
- ARM functions are now global
- Zodiac filter option
- more CD options for Pocket Tunes API

Index: globals.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/globals.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- globals.h	25 May 2004 13:15:33 -0000	1.12
+++ globals.h	12 Sep 2004 13:29:03 -0000	1.13
@@ -25,6 +25,7 @@
 
 #include <VFSMgr.h>
 #include "scumm_globals.h"
+#include "arm/native.h"
 
 enum {
 	kOptNone					=	0,
@@ -73,11 +74,17 @@
 	Boolean autoReset;
 	Boolean screenLocked;
 	Boolean stdPalette;
+	Boolean filter;
 	Coord screenWidth, screenHeight;			// silkarea shown
 	Coord screenFullWidth, screenFullHeight;	// silkarea hidden
 	UInt32 screenPitch;
 
 	struct {
+		PnoDescriptor pnoDesc;
+		MemPtr pnoPtr;
+	} arm[PNO_COUNT];
+
+	struct {
 		UInt8 on;
 		UInt8 off;
 	} indicator;
@@ -89,13 +96,12 @@
 	
 	struct {
 		Boolean enable;
-		UInt8 driver;
-		Boolean setDefaultTrackLength;
+		UInt8 driver, format;
 		UInt16 defaultTrackLength;
 		UInt16 firstTrack;
-		
+		UInt16 volume;		
 	} CD;
-
+	
 } GlobalsDataType, *GlobalsDataPtr;
 
 extern GlobalsDataPtr gVars;
@@ -104,4 +110,6 @@
 #define OPTIONS_SET(x)	gVars->options |= (x)
 #define OPTIONS_RST(x)	gVars->options &= ~(x)
 
+#define ARM(x)	gVars->arm[x]
+
 #endif





More information about the Scummvm-git-logs mailing list