minor code formatting change

[rocksndiamonds.git] / src / game_mm / mm_main.h

diff --git a/src/game_mm/mm_main.h b/src/game_mm/mm_main.h
index e65cc7d50684d0b463b8cc217ced52ba4e3714ea..468b543281afb03b614b1e49948913757be0b2d1 100644 (file)
--- 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];
@@ -209,7 +203,9 @@ extern short                StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short           Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern boolean         Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short           AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern short           AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
+extern short           AmoebaCnt[MAX_NUM_AMOEBA];
+extern short           AmoebaCnt2[MAX_NUM_AMOEBA];
+
 extern unsigned int    Elementeigenschaften[MAX_ELEMENTS];
 
 extern int             level_nr;
@@ -225,7 +221,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;
 
@@ -1111,22 +1106,7 @@ extern int               num_element_info;
 #define GAME_OVER_NO_ENERGY    1
 #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
+#define GAME_OVER_DELAYED      4
 
 // values for color_status
 #define STATIC_COLORS          0