[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src scumm_globals.h,1.6,1.7 skin.h,1.2,1.3

[Chris Apers]

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

Modified Files:
	scumm_globals.h skin.h 
Log Message:
Split palmstart.cpp into mutiple files

Index: scumm_globals.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/scumm_globals.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scumm_globals.h	18 Aug 2003 10:59:21 -0000	1.6
+++ scumm_globals.h	23 Sep 2003 15:57:28 -0000	1.7
@@ -19,28 +19,46 @@
  * $Header$
  *
  */
- 
-#define GBVARS_DIGSTATEMUSICMAP_INDEX		0
-#define GBVARS_DIGSTATEMUSICTABLE_INDEX		1
-#define GBVARS_COMISTATEMUSICTABLE_INDEX	2
-#define GBVARS_COMISEQMUSICTABLE_INDEX		3
-#define GBVARS_DIGSEQMUSICTABLE_INDEX		4
-#define GBVARS_FTSTATEMUSICTABLE_INDEX		5
-#define GBVARS_FTSEQMUSICTABLE_INDEX		6
-#define GBVARS_GUIFONT_INDEX				7
-#define GBVARS_DEFAULTSCALETABLE_INDEX 		8
-#define GBVARS_IMCTABLE_INDEX				9
-#define GBVARS_CODEC47TABLE_INDEX			10
-#define GBVARS_TRANSITIONEFFECTS_INDEX		11
-#define GBVARS_STRINGMAPTABLEV7_INDEX		12
-#define GBVARS_STRINGMAPTABLEV6_INDEX		13
-#define GBVARS_STRINGMAPTABLEV5_INDEX		14
-#define GBVARS_GERMANCHARSETDATAV2_INDEX	15
-#define GBVARS_FRENCHCHARSETDATAV2_INDEX	16
-#define GBVARS_ENGLISHCHARSETDATAV2_INDEX	17
-#define GBVARS_ITALIANCHARSETDATAV2_INDEX	18
-#define GBVARS_SPANISHCHARSETDATAV2_INDEX	19
-#define GBVARS_COSTSCALETABLE_INDEX			20
+
+#ifndef __SCUMM_GLOBALS_H__
+#define __SCUMM_GLOBALS_H__
+
+enum {
+	GBVARS_DIGSTATEMUSICMAP_INDEX = 0,
+	GBVARS_DIGSTATEMUSICTABLE_INDEX,
+	GBVARS_COMISTATEMUSICTABLE_INDEX,
+	GBVARS_COMISEQMUSICTABLE_INDEX,
+	GBVARS_DIGSEQMUSICTABLE_INDEX,
+	GBVARS_FTSTATEMUSICTABLE_INDEX,
+	GBVARS_FTSEQMUSICTABLE_INDEX,
+	GBVARS_GUIFONT_INDEX,
+	GBVARS_DEFAULTSCALETABLE_INDEX,
+	GBVARS_IMCTABLE_INDEX,
+	GBVARS_CODEC47TABLE_INDEX,
+	GBVARS_TRANSITIONEFFECTS_INDEX,
+	GBVARS_STRINGMAPTABLEV7_INDEX,
+	GBVARS_STRINGMAPTABLEV6_INDEX,
+	GBVARS_STRINGMAPTABLEV5_INDEX,
+	GBVARS_GERMANCHARSETDATAV2_INDEX,
+	GBVARS_FRENCHCHARSETDATAV2_INDEX,
+	GBVARS_ENGLISHCHARSETDATAV2_INDEX,
+	GBVARS_ITALIANCHARSETDATAV2_INDEX,
+	GBVARS_SPANISHCHARSETDATAV2_INDEX,
+	GBVARS_COSTSCALETABLE_INDEX,
+	GBVARS_NOTELENGTHS_INDEX,
+	GBVARS_HULLOFFSETS_INDEX,
+	GBVARS_HULLS_INDEX,
+	GBVARS_FREQMODLENGTHS_INDEX,
+	GBVARS_FREQMODOFFSETS_INDEX,
+	GBVARS_FREQMODTABLE_INDEX,
+	GBVARS_SPKFREQTABLE_INDEX,
+	GBVARS_PCJRFREQTABLE_INDEX
+};
+
+void *GlbGetRecord(UInt16 index, UInt16 id);
+void GlbReleaseRecord(UInt16 index, UInt16 id);
+void GlbOpen();
+void GlbClose();
 
 #define GBVARS_SCUMM	0
 #define GBVARS_SIMON	1
@@ -54,11 +72,8 @@
 #define CALL_INIT(x) initGlobals_##x();
 #define CALL_RELEASE(x)	releaseGlobals_##x();
 
-#define _GSETPTR(var,index,format,id)	var = (format *)GBGetRecord(index,id);
-#define _GRELEASEPTR(index,id)			GBReleaseRecord(index,id);
-
-void *GBGetRecord(UInt16 index, UInt16 id);
-void GBReleaseRecord(UInt16 index, UInt16 id);
+#define _GSETPTR(var,index,format,id)	var = (format *)GlbGetRecord(index,id);
+#define _GRELEASEPTR(index,id)			GlbReleaseRecord(index,id);
 
 #define PROTO_GLOBALS(x)		void CALL_INIT(x);\
 								void CALL_RELEASE(x);
@@ -72,5 +87,8 @@
 PROTO_GLOBALS(Dialogs)
 PROTO_GLOBALS(Charset)
 PROTO_GLOBALS(Costume)
+PROTO_GLOBALS(PlayerV2)
 
-#undef PROTO_GLOBALS
\ No newline at end of file
+#undef PROTO_GLOBALS
+
+#endif
\ No newline at end of file

Index: skin.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/skin.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- skin.h	30 Apr 2003 21:05:01 -0000	1.2
+++ skin.h	23 Sep 2003 15:57:28 -0000	1.3
@@ -19,10 +19,38 @@
  * $Header$
  *
  */
+#ifndef __SKIN_H__
+#define __SKIN_H__
+
+// skin 
+#define	sknInfoState		0
+#define	sknInfoPosX			1
+#define	sknInfoPosY			2
+
+#define	sknInfoMaxWOrH		3
+#define	sknInfoDrawMode		4
+#define	sknInfoKeepXOrY1	5
+#define	sknInfoKeepXOrY2	7
+
+#define sknInfoListWidth	sknInfoMaxWOrH
+#define sknInfoListHeight	sknInfoDrawMode
+#define sknInfoListSize		sknInfoListHeight
+#define sknInfoListItemSize	12
+
+#define	sknPosRsc			'sPos'
+#define	sknColorsRsc		'sCol'
+
+#define sknStateNormal		0
+#define sknStateSelected	10
+#define sknStateDisabled	20
+
+#define sknSelectedState(bmp)	(bmp + sknStateSelected)
+#define sknDisabledState(bmp)	(bmp + sknStateDisabled)
 
+// skin elements
 #define skinList					500
 #define	skinColors	600
-//#define skinPalette					510
+#define skinPalette					610
 #define skinButtonNone				0
 
 #define skinSliderUpArrow			2000
@@ -74,4 +102,22 @@
 
 #define skinButtonPlayNormal		7000
 #define skinButtonPlayOver			7010
-#define skinButtonPlayDisabled		7040
\ No newline at end of file
+#define skinButtonPlayDisabled		7040
+
+// protos
+void SknApplySkin();
+void SknGetObjectBounds(DmOpenRef skinDBP, DmResID resID, RectangleType *rP);
+DmOpenRef SknOpenSkin();
+void SknCloseSkin(DmOpenRef skinDBP);
+UInt8 SknSetState(DmOpenRef skinDBP, DmResID resID, UInt8 newState);
+void SknShowObject(DmOpenRef skinDBP, DmResID resID);
+UInt8 SknGetState(DmOpenRef skinDBP, DmResID resID);
+void SknUpdateList();
+void SknGetListBounds(RectangleType *rAreaP, RectangleType *rArea2xP);
+UInt16 SknCheckClick(DmOpenRef skinDBP, Coord mx, Coord my);
+void SknSelect(Coord x, Coord y);
+Boolean SknProcessArrowAction(UInt16 button);
+
+extern UInt16 lastIndex;
+
+#endif
\ No newline at end of file