[Scummvm-cvs-logs] CVS: scummvm/sky skydefs.h,1.16,1.17 logic.h,1.15,1.16

[Oliver Kiehl]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv7439

Modified Files:
	skydefs.h logic.h 
Log Message:
slight cleanup


Index: skydefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/skydefs.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- skydefs.h	26 May 2003 17:41:18 -0000	1.16
+++ skydefs.h	26 May 2003 17:56:17 -0000	1.17
@@ -19,6 +19,9 @@
  *
  */
 
+#ifndef SKYDEFS_H
+#define SKYDEFS_H
+
 #include "struc.h"
 
 //This file is incomplete, several flags still missing.
@@ -36,26 +39,6 @@
 
 #define	FIRST_TEXT_COMPACT	23
 
-// scriptVariable offsets
-#define RESULT	0
-#define SCREEN	1
-#define LOGIC_LIST_NO	2
-#define CUR_ID	12
-#define MOUSE_STATUS	13
-#define MOUSE_STOP	14
-#define GET_OFF	18
-#define PLAYER_X	27
-#define PLAYER_Y	28
-#define PLAYER_MOOD	29
-#define PLAYER_SCREEN	30
-#define HIT_ID	37
-#define THE_CHOSEN_ONE	51
-#define TEXT1	53
-#define MENU_LENGTH	100
-#define SCROLL_OFFSET	101
-#define MENU	102
-#define CUR_SECTION	143
-
 //screen/grid defines
 #define GAME_SCREEN_WIDTH	320
 #define GAME_SCREEN_HEIGHT	192
@@ -4302,5 +4285,5 @@
 #define MOUSE_CROSS	(1 << 7)	// angry mouse
 #define MOUSE_UP	(1 << 8)	// mouse up
 
-
+#endif
 

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- logic.h	26 May 2003 17:41:18 -0000	1.15
+++ logic.h	26 May 2003 17:56:17 -0000	1.16
@@ -29,6 +29,27 @@
 #include "sky/musicbase.h"
 #include "sky/mouse.h"
 
+enum scriptVariableOffsets {
+	RESULT = 0,
+	SCREEN = 1,
+	LOGIC_LIST_NO = 2,
+	CUR_ID = 12,
+	MOUSE_STATUS = 13,
+	MOUSE_STOP = 14,
+	GET_OFF = 18,
+	PLAYER_X = 27,
+	PLAYER_Y = 28,
+	PLAYER_MOOD = 29,
+	PLAYER_SCREEN = 30,
+	HIT_ID = 37,
+	THE_CHOSEN_ONE = 51,
+	TEXT1 = 53,
+	MENU_LENGTH = 100,
+	SCROLL_OFFSET = 101,
+	MENU = 102,
+	CUR_SECTION = 143
+};
+
 class SkyLogic {
 public:
 	SkyLogic(SkyDisk *skyDisk, SkyGrid *skyGrid, SkyText *skyText, SkyMusicBase *skyMusic, SkyMouse *skyMouse, SkySound *skySound, uint32 gameVersion);