X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_main.h;h=af5b832faaaacd3e4e5d40b519b18a33e123f0e4;hb=2cfee1e01acbf98c4ff8bb0f9fc04b7b5605751f;hp=e65cc7d50684d0b463b8cc217ced52ba4e3714ea;hpb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;p=rocksndiamonds.git

diff --git a/src/game_mm/mm_main.h b/src/game_mm/mm_main.h
index e65cc7d5..af5b832f 100644
--- a/src/game_mm/mm_main.h
+++ b/src/game_mm/mm_main.h
@@ -123,10 +123,10 @@
 				 IS_WALL_AMOEBA(e))
 
 #define CAN_MOVE(e)		((e) == EL_PACMAN)
-#define IS_FREE(x,y)            (Feld[x][y] == EL_EMPTY)
+#define IS_FREE(x,y)            (Tile[x][y] == EL_EMPTY)
 
 #define IS_MOVING(x,y)          (MovPos[x][y] != 0)
-#define IS_BLOCKED(x,y)         (Feld[x][y] == EL_BLOCKED)
+#define IS_BLOCKED(x,y)         (Tile[x][y] == EL_BLOCKED)
 #define IS_DRAWABLE(e)          ((e) < EL_BLOCKED)
 #define IS_NOT_DRAWABLE(e)      ((e) >= EL_BLOCKED)
 
@@ -180,12 +180,6 @@
 #define LEVEL_SCORE_ELEMENTS	16	// level elements with score
 
 
-struct HiScore_MM
-{
-  char Name[MAX_PLAYER_NAME_LEN + 1];
-  int Score;
-};
-
 extern DrawBuffer      *drawto_field;
 
 extern int		game_status;
@@ -194,7 +188,7 @@ extern boolean		level_editor_test_game;
 extern boolean		redraw[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int		redraw_x1, redraw_y1;
 
-extern short		Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		Tile[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short		Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short		Hit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short		Box[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -225,7 +219,6 @@ extern int		SBY_Upper, SBY_Lower;
 extern int		TimeFrames, TimePlayed, TimeLeft;
 
 extern struct LevelInfo_MM	native_mm_level;
-extern struct HiScore_MM	highscore[];
 extern struct GameInfo_MM	game_mm;
 extern struct LaserInfo		laser;
 
@@ -1112,22 +1105,6 @@ extern int		num_element_info;
 #define GAME_OVER_OVERLOADED	2
 #define GAME_OVER_BOMB		3
 
-// values for game_status
-#define EXITGAME		0
-#define MAINMENU		1
-#define PLAYING			2
-#define LEVELED			3
-#define HELPSCREEN		4
-#define CHOOSELEVEL		5
-#define TYPENAME		6
-#define HALLOFFAME		7
-#define SETUP			8
-
-// return values for GameActions
-#define ACT_GO_ON		0
-#define ACT_GAME_OVER		1
-#define ACT_NEW_GAME		2
-
 // values for color_status
 #define STATIC_COLORS		0
 #define DYNAMIC_COLORS		1