#include "main_em.h"
-#define MIN_SCREEN_XPOS 1
-#define MIN_SCREEN_YPOS 1
-#define MAX_SCREEN_XPOS MAX(1, lev.width - (SCR_FIELDX - 1))
-#define MAX_SCREEN_YPOS MAX(1, lev.height - (SCR_FIELDY - 1))
+#define MIN_SCREEN_XPOS_RAW 0
+#define MIN_SCREEN_YPOS_RAW 0
+#define MAX_SCREEN_XPOS_RAW MAX(0, lev.width - SCR_FIELDX)
+#define MAX_SCREEN_YPOS_RAW MAX(0, lev.height - SCR_FIELDY)
+
+#define MIN_SCREEN_XPOS (MIN_SCREEN_XPOS_RAW + CAVE_BUFFER_XOFFSET)
+#define MIN_SCREEN_YPOS (MIN_SCREEN_YPOS_RAW + CAVE_BUFFER_YOFFSET)
+#define MAX_SCREEN_XPOS (MAX_SCREEN_XPOS_RAW + CAVE_BUFFER_XOFFSET)
+#define MAX_SCREEN_YPOS (MAX_SCREEN_YPOS_RAW + CAVE_BUFFER_YOFFSET)
#define MIN_SCREEN_X (MIN_SCREEN_XPOS * TILEX)
#define MIN_SCREEN_Y (MIN_SCREEN_YPOS * TILEY)
int screen_x, screen_y; /* current scroll position */
/* tiles currently on screen */
-static int screentiles[MAX_PLAYFIELD_HEIGHT + 2][MAX_PLAYFIELD_WIDTH + 2];
-static int crumbled_state[MAX_PLAYFIELD_HEIGHT + 2][MAX_PLAYFIELD_WIDTH + 2];
+static int screentiles[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2];
+static int crumbled_state[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2];
int getFieldbufferOffsetX_EM(void)
{
static struct GraphicInfo_EM *getObjectGraphic(int x, int y)
{
- int tile = Draw[y][x];
+ int tile = lev.draw[x][y];
struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
if (!game.use_native_emc_graphics_engine)
};
if (!game.use_native_emc_graphics_engine)
- for (y = 2; y < EM_MAX_CAVE_HEIGHT - 2; y++)
- for (x = 2; x < EM_MAX_CAVE_WIDTH - 2; x++)
- SetGfxAnimation_EM(&graphic_info_em_object[Draw[y][x]][frame],
- Draw[y][x], 7 - frame, x - 2, y - 2);
+ for (y = 2; y < CAVE_BUFFER_HEIGHT - 2; y++)
+ for (x = 2; x < CAVE_BUFFER_WIDTH - 2; x++)
+ SetGfxAnimation_EM(&graphic_info_em_object[lev.draw[x][y]][frame],
+ lev.draw[x][y], 7 - frame, x - 2, y - 2);
for (y = top; y < top + MAX_BUF_YSIZE; y++)
{
{
int sx = x % MAX_BUF_XSIZE;
int sy = y % MAX_BUF_YSIZE;
- int tile = Draw[y][x];
+ int tile = lev.draw[x][y];
struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
int obj = g->unique_identifier;
int crm = 0;
int yy = y + xy[i][1];
int tile_next;
- if (xx < 0 || xx >= EM_MAX_CAVE_WIDTH ||
- yy < 0 || yy >= EM_MAX_CAVE_HEIGHT)
+ if (xx < 0 || xx >= CAVE_BUFFER_WIDTH ||
+ yy < 0 || yy >= CAVE_BUFFER_HEIGHT)
continue;
- tile_next = Draw[yy][xx];
+ tile_next = lev.draw[xx][yy];
if (!graphic_info_em_object[tile_next][frame].has_crumbled_graphics)
crm |= (1 << i);
}
}
- redraw_screen_tile = (screentiles[sy][sx] != obj ||
- crumbled_state[sy][sx] != crm);
+ redraw_screen_tile = (screentiles[sx][sy] != obj ||
+ crumbled_state[sx][sy] != crm);
/* only redraw screen tiles if they (or their crumbled state) changed */
if (redraw_screen_tile)
DrawLevelField_EM(x, y, sx, sy, FALSE);
DrawLevelFieldCrumbled_EM(x, y, sx, sy, crm, FALSE);
- screentiles[sy][sx] = obj;
- crumbled_state[sy][sx] = crm;
+ screentiles[sx][sy] = obj;
+ crumbled_state[sx][sy] = crm;
}
}
}
int old_sy = old_y % MAX_BUF_YSIZE;
int new_sx = new_x % MAX_BUF_XSIZE;
int new_sy = new_y % MAX_BUF_YSIZE;
- int new_crm = crumbled_state[new_sy][new_sx];
+ int new_crm = crumbled_state[new_sx][new_sy];
/* only diggable elements can be crumbled in the classic EM engine */
boolean player_is_digging = (new_crm != 0);
}
/* redraw screen tiles in the next frame (player may have left the tiles) */
- screentiles[old_sy][old_sx] = -1;
- screentiles[new_sy][new_sx] = -1;
+ screentiles[old_sx][old_sy] = -1;
+ screentiles[new_sx][new_sy] = -1;
}
}
{
for (x = 0; x < MAX_BUF_XSIZE; x++)
{
- screentiles[y][x] = -1;
- crumbled_state[y][x] = 0;
+ screentiles[x][y] = -1;
+ crumbled_state[x][y] = 0;
}
}
}
{
for (x = 0; x < MAX_BUF_XSIZE; x++)
{
- screentiles[y][x] = -1;
- crumbled_state[y][x] = 0;
+ screentiles[x][y] = -1;
+ crumbled_state[x][y] = 0;
}
}
}