X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_main.h;h=70758c2443a1ca77365e832682b75e889b04d358;hb=6cf34a189f4a3707c9131652621dd67731f14f6b;hp=7688cca13c79394056f22fd9451d0ea608dd9c7b;hpb=55961e9ba1fe67292a41fdcca0056b43bf960a93;p=rocksndiamonds.git

diff --git a/src/game_mm/mm_main.h b/src/game_mm/mm_main.h
index 7688cca1..70758c24 100644
--- a/src/game_mm/mm_main.h
+++ b/src/game_mm/mm_main.h
@@ -156,11 +156,30 @@
 #define MAX_SCORE_ENTRIES	100
 #define MAX_ELEMENTS		700		/* 500 static + 200 runtime */
 
-#define LEVEL_SCORE_ELEMENTS	16	/* level elements with score */
-
 #define MICROLEVEL_SCROLL_DELAY	50	/* delay for scrolling micro level */
 #define MICROLEVEL_LABEL_DELAY	250	/* delay for micro level label */
 
+/* score for elements */
+#define SC_COLLECTIBLE		0
+#define SC_UNUSED_1		1
+#define SC_UNUSED_2		2
+#define SC_UNUSED_3		3
+#define SC_UNUSED_4		4
+#define SC_UNUSED_5		5
+#define SC_PACMAN		6
+#define SC_UNUSED_7		7
+#define SC_UNUSED_8		8
+#define SC_KEY			9
+#define SC_TIME_BONUS		10
+#define SC_UNUSED_11		11
+#define SC_UNUSED_12		12
+#define SC_UNUSED_13		13
+#define SC_LIGHTBALL		14
+#define SC_UNUSED_15		15
+
+#define LEVEL_SCORE_ELEMENTS	16	/* level elements with score */
+
+
 struct HiScore_MM
 {
   char Name[MAX_PLAYER_NAME_LEN + 1];
@@ -232,6 +251,11 @@ extern struct GlobalInfo	global;
 extern short 		LX, LY, XS, YS, ELX, ELY;
 extern short 		CT, Ct;
 
+extern int		dSX, dSY;
+extern int		cSX, cSY;
+extern int		cSX2, cSY2;
+extern int		cFX, cFY;
+
 extern Pixel		pen_fg, pen_bg, pen_ray, pen_magicolor[2];
 extern int		color_status;
 
@@ -245,10 +269,6 @@ extern char	       *element_info[];
 extern int		num_element_info;
 
 /* often used screen positions */
-#define SX			8
-#define SY			8
-#define REAL_SX			(SX - 2)
-#define REAL_SY			(SY - 2)
 #define DX			534
 #define DY			60
 #define EX			DX
@@ -1156,9 +1176,9 @@ extern int		num_element_info;
 
 /* functions for version handling */
 #define MM_VERSION_IDENT(x,y,z)	VERSION_IDENT(x,y,z,0)
-#define MM_VERSION_MAJOR(x)	VERSION_MAJOR(x)
-#define MM_VERSION_MINOR(x)	VERSION_MINOR(x)
-#define MM_VERSION_PATCH(x)	VERSION_PATCH(x)
+#define MM_VERSION_MAJOR(x)	VERSION_PART_1(x)
+#define MM_VERSION_MINOR(x)	VERSION_PART_2(x)
+#define MM_VERSION_PATCH(x)	VERSION_PART_3(x)
 
 /* file version numbers for resource files (levels, score, setup, etc.)
 ** currently supported/known file version numbers: