rnd-20100624-1-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index aab51a3824fce88fde27434e27eb7497915e3a4b..796fb9fbb58338610d347dfecc776c00d865fd54 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -20,6 +20,7 @@
 #include "events.h"
 #include "config.h"
 
+Bitmap                *bitmap_db_store;
 Bitmap                *bitmap_db_cross;
 Bitmap                *bitmap_db_field;
 Bitmap                *bitmap_db_panel;
@@ -40,7 +41,11 @@ SDL_Thread          *server_thread;
 int                    key_joystick_mapping = 0;
 
 #if 1
+#if NEW_SCROLL
+boolean                        redraw[2 + MAX_LEV_FIELDX + 2][2 + MAX_LEV_FIELDY + 2];
+#else
 boolean                        redraw[MAX_LEV_FIELDX + 2][MAX_LEV_FIELDY + 2];
+#endif
 #else
 boolean                        redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 #endif
@@ -90,11 +95,23 @@ int                 scroll_x, scroll_y;
 
 int                    WIN_XSIZE = 672, WIN_YSIZE = 560;
 int                    SCR_FIELDX = 17, SCR_FIELDY = 17;
+int                    SX = 8, SY = 8;
+int                    REAL_SX = 6, REAL_SY = 6;
 int                    DX = 566, DY = 60;
 int                    VX = 566, VY = 400;
 int                    EX = 566, EY = 356;
+int                    dDX, dDY;
+int                    SXSIZE = 17 * TILEX;    /* SCR_FIELDX * TILEX */
+int                    SYSIZE = 17 * TILEY;    /* SCR_FIELDY * TILEY */
+int                    FULL_SXSIZE = 2 + 17 * TILEX + 2; /* 2 + SXSIZE + 2 */
+int                    FULL_SYSIZE = 2 + 17 * TILEY + 2; /* 2 + SYSIZE + 2 */
+int                    TILESIZE_VAR = TILESIZE / 2;
 
+#if 1
+int                    FX, FY;
+#else
 int                    FX = SX, FY = SY;
+#endif
 int                    ScrollStepSize;
 int                    ScreenMovDir = MV_NONE, ScreenMovPos = 0;
 int                    ScreenGfxPos = 0;