X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fmain_em.h;h=1376d58b545d8d308acc66c04ac473d891244b2b;hb=eff474825c141289a835a313dcd83fa1f461faab;hp=6c9653154b8631e38e716fed372d56d99c286ff8;hpb=14d7691c65ca4a466ce9b9448153e8fbe8351a81;p=rocksndiamonds.git

diff --git a/src/game_em/main_em.h b/src/game_em/main_em.h
index 6c965315..1376d58b 100644
--- a/src/game_em/main_em.h
+++ b/src/game_em/main_em.h
@@ -1,31 +1,30 @@
 #ifndef MAIN_EM_H
 #define MAIN_EM_H
 
-/* ========================================================================= */
-/* external functions and definitions imported from main program to game_em  */
-/* ========================================================================= */
+// ============================================================================
+// external functions and definitions imported from main program to game_em
+// ============================================================================
 
 #include "../engines.h"
 
 
-/* ========================================================================= */
-/* functions and definitions that are exported from game_em to main program  */
-/* ========================================================================= */
+// ============================================================================
+// functions and definitions that are exported from game_em to main program
+// ============================================================================
 
 #include "export.h"
 
 
-/* ========================================================================= */
-/* internal functions and definitions that are not exported to main program  */
-/* ========================================================================= */
+// ============================================================================
+// internal functions and definitions that are not exported to main program
+// ============================================================================
 
 #include "global.h"
-#include "sample.h"
 
 
-/* ------------------------------------------------------------------------- */
-/* constant definitions                                                      */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// constant definitions
+// ----------------------------------------------------------------------------
 
 /* values for native Emerald Mine game version */
 #define FILE_VERSION_EM_UNKNOWN	0
@@ -68,9 +67,9 @@ extern int			SX, SY;
 #define PLAY_ELEMENT_SOUND	FALSE
 
 
-/* ------------------------------------------------------------------------- */
-/* macro function definitions                                                */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// macro function definitions
+// ----------------------------------------------------------------------------
 
 #define ROUNDED_DIVIDE(x, y)	(((x) + (y) - 1) / (y))
 
@@ -83,13 +82,13 @@ extern int			SX, SY;
 #define DISPLAY_TIME(x)		ROUNDED_DIVIDE(x, FRAMES_PER_SECOND)
 
 
-/* ------------------------------------------------------------------------- */
-/* data structure definitions                                                */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// data structure definitions
+// ----------------------------------------------------------------------------
 
-/* ------------------------------------------------------------------------- */
-/* exported variables                                                        */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// exported variables
+// ----------------------------------------------------------------------------
 
 extern unsigned int RandomEM;
 
@@ -98,7 +97,7 @@ extern struct PLAYER ply[MAX_PLAYERS];
 
 extern struct LevelInfo_EM native_em_level;
 extern struct GraphicInfo_EM graphic_info_em_object[TILE_MAX][8];
-extern struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][SPR_MAX][8];
+extern struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8];
 
 extern short **Boom;
 extern short **Cave;
@@ -115,7 +114,7 @@ extern unsigned short tab_explode_normal[TILE_MAX];
 extern unsigned short tab_explode_dynamite[TILE_MAX];
 
 extern unsigned short map_obj[8][TILE_MAX];
-extern unsigned short map_spr[2][8][SPR_MAX];
+extern unsigned short map_ply[2][8][PLY_MAX];
 extern unsigned short map_ttl[128];
 
 extern Bitmap *screenBitmap;
@@ -127,8 +126,8 @@ extern Bitmap *ttlBitmap;
 extern Bitmap *botBitmap;
 
 
-/* ------------------------------------------------------------------------- */
-/* exported functions                                                        */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// exported functions
+// ----------------------------------------------------------------------------
 
-#endif	/* MAIN_EM_H */
+#endif	// MAIN_EM_H