changed comments from old to new style (one-line comments only)

[rocksndiamonds.git] / src / game_em / main_em.h

diff --git a/src/game_em/main_em.h b/src/game_em/main_em.h
index 87e9d9527fb147a470eddbf8684cb25adc0ae20d..4b77e9356b336dffca35d03838a15be9e14c8eae 100644 (file)
--- a/src/game_em/main_em.h
+++ b/src/game_em/main_em.h
@@ -1,31 +1,31 @@
 #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
@@ -45,41 +45,22 @@
 
 /* screen sizes and positions for EM engine */
 
-#define ORIG_TILEX             16
-#define ORIG_TILEY             16
-#define ORIG_SCOREX            8
-#define ORIG_SCOREY            9
-#define ORIG_GFXMENUFONTX      14
-#define ORIG_GFXMENUFONTY      16
-#define ORIG_MENUFONTX         12
-#define ORIG_MENUFONTY         16
-
-#define ZOOM_FACTOR            2
-
-#define TILEX                  (ORIG_TILEX             * ZOOM_FACTOR)
-#define TILEY                  (ORIG_TILEY             * ZOOM_FACTOR)
-#define SCOREX                 (ORIG_SCOREX            * ZOOM_FACTOR)
-#define SCOREY                 (ORIG_SCOREY            * ZOOM_FACTOR)
-#define GFXMENUFONTX           (ORIG_GFXMENUFONTX      * ZOOM_FACTOR)
-#define GFXMENUFONTY           (ORIG_GFXMENUFONTY      * ZOOM_FACTOR)
-#define MENUFONTX              (ORIG_MENUFONTX         * ZOOM_FACTOR)
-#define MENUFONTY              (ORIG_MENUFONTY         * ZOOM_FACTOR)
-
-#define ORIG_SCR_MENUX         20
-#define ORIG_SCR_MENUY         12
-#define SCR_MENUX              17
-#define SCR_MENUY              12
-#define SCR_FIELDX             17
-#define SCR_FIELDY             17
+#define TILESIZE               32
+
+extern int                     TILESIZE_VAR;
+
+#define TILEX                  TILESIZE_VAR
+#define TILEY                  TILESIZE_VAR
+
+extern int                     SCR_FIELDX, SCR_FIELDY;
+
 #define MAX_BUF_XSIZE          (SCR_FIELDX + 2)
 #define MAX_BUF_YSIZE          (SCR_FIELDY + 2)
 
 /* often used screen positions */
-#define ORIG_MENU_SX           ((ORIG_SCR_MENUX - SCR_MENUX) * TILEX / 2)
-#define ORIG_MENU_SY           0
-#define SY                     8
-#define SX                     8
-#define SY                     8
+
+extern int                     SX, SY;
+
 #define SXSIZE                 (SCR_FIELDX * TILEX)
 #define SYSIZE                 (SCR_FIELDY * TILEY)
 
@@ -87,9 +68,9 @@
 #define PLAY_ELEMENT_SOUND     FALSE
 
 
-/* ------------------------------------------------------------------------- */
-/* macro function definitions                                                */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// macro function definitions
+// ----------------------------------------------------------------------------
 
 #define ROUNDED_DIVIDE(x, y)   (((x) + (y) - 1) / (y))
 
@@ -102,15 +83,15 @@
 #define DISPLAY_TIME(x)                ROUNDED_DIVIDE(x, FRAMES_PER_SECOND)
 
 
-/* ------------------------------------------------------------------------- */
-/* data structure definitions                                                */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// data structure definitions
+// ----------------------------------------------------------------------------
 
-/* ------------------------------------------------------------------------- */
-/* exported variables                                                        */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// exported variables
+// ----------------------------------------------------------------------------
 
-extern unsigned long RandomEM;
+extern unsigned int RandomEM;
 
 extern struct LEVEL lev;
 extern struct PLAYER ply[MAX_PLAYERS];
@@ -145,18 +126,9 @@ extern Bitmap *sprBitmap;
 extern Bitmap *ttlBitmap;
 extern Bitmap *botBitmap;
 
-extern Pixmap screenPixmap;
-extern Pixmap scorePixmap;
-extern Pixmap spriteBitmap;
-
-extern Pixmap objmaskBitmap;
-extern Pixmap sprmaskBitmap;
-
-extern GC spriteGC;
-
 
-/* ------------------------------------------------------------------------- */
-/* exported functions                                                        */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// exported functions
+// ----------------------------------------------------------------------------
 
-#endif /* MAIN_EM_H */
+#endif // MAIN_EM_H