X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2Fmain_sp.h;h=2eee6ef6c7df755d7d44679d9176524ea24d2f82;hb=dec5093fc78bfe1356d764c2432fed6566b2af66;hp=6e61508b44bdc93487cb51a5eb817d7d57c2c013;hpb=41def9c1d8c6939b8754fdab43579272e49d4da4;p=rocksndiamonds.git

diff --git a/src/game_sp/main_sp.h b/src/game_sp/main_sp.h
index 6e61508b..2eee6ef6 100644
--- a/src/game_sp/main_sp.h
+++ b/src/game_sp/main_sp.h
@@ -1,82 +1,67 @@
 #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_TILESIZE		16
+extern int			TILESIZE_VAR;
 
-#define ZOOM_FACTOR		2
-
-#define TILESIZE		(ORIG_TILESIZE * ZOOM_FACTOR)
+#define TILESIZE		32
 #define TILEX			TILESIZE
 #define TILEY			TILESIZE
+#define TILEX_VAR		TILESIZE_VAR
+#define TILEY_VAR		TILESIZE_VAR
 
-#define ORIG_SCR_MENUX		20
-#define ORIG_SCR_MENUY		12
-#define SCR_MENUX		17
-#define SCR_MENUY		12
-#if 1
 extern int			SCR_FIELDX, SCR_FIELDY;
-#else
-#define SCR_FIELDX		17
-#define SCR_FIELDY		17
-#endif
+
 #define MAX_BUF_XSIZE		(2 + SCR_FIELDX + 2)
 #define MAX_BUF_YSIZE		(2 + SCR_FIELDY + 2)
 
-/* often used screen positions */
-#if 1
+// often used screen positions
+
 extern int			SX, SY;
-#else
-#define SX			8
-#define SY			8
-#endif
-#define SXSIZE			(SCR_FIELDX * TILEX)
-#define SYSIZE			(SCR_FIELDY * TILEY)
-#define FXSIZE			(MAX_BUF_XSIZE * TILEX)
-#define FYSIZE			(MAX_BUF_YSIZE * TILEY)
-
-#if 1
+
+#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;
-#else
-#define REAL_SX			(SX - 2)
-#define REAL_SY			(SY - 2)
-#endif
+
 #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;
 
@@ -88,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