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

[rocksndiamonds.git] / src / game_sp / main_sp.h

diff --git a/src/game_sp/main_sp.h b/src/game_sp/main_sp.h
index ff3035a483dd0c2a20ef6f8af10f7f09f1a7ad31..2eee6ef6c7df755d7d44679d9176524ea24d2f82 100644 (file)
--- a/src/game_sp/main_sp.h
+++ b/src/game_sp/main_sp.h
@@ -1,74 +1,71 @@
 #ifndef MAIN_SP_H
 #define MAIN_SP_H
 
-/* ========================================================================= */
-/* external functions and definitions imported from main program to game_sp  */
-/* ========================================================================= */
+// ============================================================================
+// external functions and definitions imported from main program to game_sp
+// ============================================================================
 
 #include "../engines.h"
 #include "../conf_gfx.h"
 
 
-/* ========================================================================= */
-/* functions and definitions that are exported from game_sp to main program  */
-/* ========================================================================= */
+// ============================================================================
+// functions and definitions that are exported from game_sp 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
+// ============================================================================
 
 
-/* ------------------------------------------------------------------------- */
-/* constant definitions                                                      */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// constant definitions
+// ----------------------------------------------------------------------------
 
-/* screen sizes and positions for SP engine */
+// screen sizes and positions for SP engine
 
-#define ORIG_TILEX             16
-#define ORIG_TILEY             16
+extern int                     TILESIZE_VAR;
 
-#define ZOOM_FACTOR            2
+#define TILESIZE               32
+#define TILEX                  TILESIZE
+#define TILEY                  TILESIZE
+#define TILEX_VAR              TILESIZE_VAR
+#define TILEY_VAR              TILESIZE_VAR
 
-#define TILEX                  (ORIG_TILEX             * ZOOM_FACTOR)
-#define TILEY                  (ORIG_TILEY             * ZOOM_FACTOR)
+extern int                     SCR_FIELDX, SCR_FIELDY;
 
-#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 MAX_BUF_XSIZE          (2 + SCR_FIELDX + 2)
 #define MAX_BUF_YSIZE          (2 + SCR_FIELDY + 2)
 
-/* often used screen positions */
-#define SX                     8
-#define SY                     8
-#define SXSIZE                 (SCR_FIELDX * TILEX)
-#define SYSIZE                 (SCR_FIELDY * TILEY)
+// often used screen positions
+
+extern int                     SX, SY;
+
+#define SXSIZE                 (SCR_FIELDX * TILEX_VAR)
+#define SYSIZE                 (SCR_FIELDY * TILEY_VAR)
+#define FXSIZE                 (MAX_BUF_XSIZE * TILEX_VAR)
+#define FYSIZE                 (MAX_BUF_YSIZE * TILEY_VAR)
+
+extern int                     REAL_SX, REAL_SY;
 
-#define REAL_SX                        (SX - 2)
-#define REAL_SY                        (SY - 2)
 #define FULL_SXSIZE            (2 + SXSIZE + 2)
 #define FULL_SYSIZE            (2 + SYSIZE + 2)
 
 
-/* ------------------------------------------------------------------------- */
-/* data structure definitions                                                */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// data structure definitions
+// ----------------------------------------------------------------------------
 
-/* ------------------------------------------------------------------------- */
-/* exported variables                                                        */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// exported variables
+// ----------------------------------------------------------------------------
 
 extern struct LevelInfo_SP native_sp_level;
 
-extern Bitmap *screenBitmap;
-
-extern Bitmap *sp_objects;
+extern Bitmap *bitmap_db_field_sp;
 
 extern int GfxElementLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
 extern int GfxGraphicLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
@@ -76,8 +73,8 @@ extern int GfxGraphic[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
 extern int GfxFrame[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
 
 
-/* ------------------------------------------------------------------------- */
-/* exported functions                                                        */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// exported functions
+// ----------------------------------------------------------------------------
 
-#endif /* MAIN_SP_H */
+#endif // MAIN_SP_H