#define VALID_SCREEN_Y(y) ((y) < MIN_SCREEN_Y ? MIN_SCREEN_Y : \
(y) > MAX_SCREEN_Y ? MAX_SCREEN_Y : (y))
-#define PLAYER_SCREEN_X(p) ((( frame) * ply[p].oldx + \
- (8 - frame) * ply[p].x) * TILEX / 8 \
- - ((SCR_FIELDX - 1) * TILEX) / 2)
-#define PLAYER_SCREEN_Y(p) ((( frame) * ply[p].oldy + \
- (8 - frame) * ply[p].y) * TILEY / 8 \
- - ((SCR_FIELDY - 1) * TILEY) / 2)
+#define PLAYER_POS_X(nr) (((7 - frame) * ply[nr].oldx + \
+ (1 + frame) * ply[nr].x) * TILEX / 8)
+#define PLAYER_POS_Y(nr) (((7 - frame) * ply[nr].oldy + \
+ (1 + frame) * ply[nr].y) * TILEY / 8)
+
+#define PLAYER_SCREEN_X(nr) (PLAYER_POS_X(nr) - \
+ (SCR_FIELDX - 1) * TILEX / 2)
+#define PLAYER_SCREEN_Y(nr) (PLAYER_POS_Y(nr) - \
+ (SCR_FIELDY - 1) * TILEY / 2)
#define USE_EXTENDED_GRAPHICS_ENGINE 1
int screen_x, screen_y; /* current scroll position */
/* tiles currently on screen */
-static int screentiles[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2];
+static int screen_tiles[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2];
static int crumbled_state[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2];
/* graphic info for game objects/frames and players/actions/frames */
-struct GraphicInfo_EM graphic_info_em_object[TILE_MAX][8];
+struct GraphicInfo_EM graphic_info_em_object[GAME_TILE_MAX][8];
struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8];
int getFieldbufferOffsetX_EM(void)
int sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0);
int sxsize = (full_xsize < xsize ? full_xsize : xsize);
int sysize = (full_ysize < ysize ? full_ysize : ysize);
+ int xxsize = MAX_BUF_XSIZE * TILEX - x;
+ int yysize = MAX_BUF_YSIZE * TILEY - y;
+ int xoffset = 2 * CAVE_BUFFER_XOFFSET * TILEX;
+ int yoffset = 2 * CAVE_BUFFER_YOFFSET * TILEY;
- if (x < 2 * TILEX && y < 2 * TILEY)
+ if (x < xoffset && y < yoffset)
{
- BlitBitmap(screenBitmap, target_bitmap, x, y,
- sxsize, sysize, sx, sy);
+ BlitBitmap(screenBitmap, target_bitmap, x, y, sxsize, sysize,
+ sx, sy);
}
- else if (x < 2 * TILEX && y >= 2 * TILEY)
+ else if (x < xoffset && y >= yoffset)
{
- BlitBitmap(screenBitmap, target_bitmap, x, y,
- sxsize, MAX_BUF_YSIZE * TILEY - y,
+ BlitBitmap(screenBitmap, target_bitmap, x, y, sxsize, yysize,
sx, sy);
- BlitBitmap(screenBitmap, target_bitmap, x, 0,
- sxsize, y - 2 * TILEY,
- sx, sy + MAX_BUF_YSIZE * TILEY - y);
+ BlitBitmap(screenBitmap, target_bitmap, x, 0, sxsize, y - yoffset,
+ sx, sy + yysize);
}
- else if (x >= 2 * TILEX && y < 2 * TILEY)
+ else if (x >= xoffset && y < yoffset)
{
- BlitBitmap(screenBitmap, target_bitmap, x, y,
- MAX_BUF_XSIZE * TILEX - x, sysize,
+ BlitBitmap(screenBitmap, target_bitmap, x, y, xxsize, sysize,
sx, sy);
- BlitBitmap(screenBitmap, target_bitmap, 0, y,
- x - 2 * TILEX, sysize,
- sx + MAX_BUF_XSIZE * TILEX - x, sy);
+ BlitBitmap(screenBitmap, target_bitmap, 0, y, x - xoffset, sysize,
+ sx + xxsize, sy);
}
else
{
- BlitBitmap(screenBitmap, target_bitmap, x, y,
- MAX_BUF_XSIZE * TILEX - x, MAX_BUF_YSIZE * TILEY - y,
+ BlitBitmap(screenBitmap, target_bitmap, x, y, xxsize, yysize,
sx, sy);
- BlitBitmap(screenBitmap, target_bitmap, 0, y,
- x - 2 * TILEX, MAX_BUF_YSIZE * TILEY - y,
- sx + MAX_BUF_XSIZE * TILEX - x, sy);
- BlitBitmap(screenBitmap, target_bitmap, x, 0,
- MAX_BUF_XSIZE * TILEX - x, y - 2 * TILEY,
- sx, sy + MAX_BUF_YSIZE * TILEY - y);
- BlitBitmap(screenBitmap, target_bitmap, 0, 0,
- x - 2 * TILEX, y - 2 * TILEY,
- sx + MAX_BUF_XSIZE * TILEX - x, sy + MAX_BUF_YSIZE * TILEY - y);
+ BlitBitmap(screenBitmap, target_bitmap, 0, y, x - xoffset, yysize,
+ sx + xxsize, sy);
+ BlitBitmap(screenBitmap, target_bitmap, x, 0, xxsize, y - yoffset,
+ sx, sy + yysize);
+ BlitBitmap(screenBitmap, target_bitmap, 0, 0, x - xoffset, y - yoffset,
+ sx + xxsize, sy + yysize);
}
}
struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
if (!game.use_native_emc_graphics_engine)
- getGraphicSourceObjectExt_EM(g, tile, 7 - frame, x - lev.left, y - lev.top);
+ getGraphicSourceObjectExt_EM(g, tile, frame, x - lev.left, y - lev.top);
return g;
}
struct GraphicInfo_EM *g = &graphic_info_em_player[player_nr][anim][frame];
if (!game.use_native_emc_graphics_engine)
- getGraphicSourcePlayerExt_EM(g, player_nr, anim, 7 - frame);
+ getGraphicSourcePlayerExt_EM(g, player_nr, anim, frame);
return g;
}
for (y = lev.top; y < lev.bottom; y++)
for (x = lev.left; x < lev.right; x++)
SetGfxAnimation_EM(&graphic_info_em_object[lev.draw[x][y]][frame],
- lev.draw[x][y], 7 - frame,
+ lev.draw[x][y], frame,
x - lev.left, y - lev.top);
for (y = top; y < top + MAX_BUF_YSIZE; y++)
}
}
- redraw_screen_tile = (screentiles[sx][sy] != obj ||
+ redraw_screen_tile = (screen_tiles[sx][sy] != obj ||
crumbled_state[sx][sy] != crm);
/* only redraw screen tiles if they (or their crumbled state) changed */
DrawLevelField_EM(x, y, sx, sy, FALSE);
DrawLevelFieldCrumbled_EM(x, y, sx, sy, crm, FALSE);
- screentiles[sx][sy] = obj;
+ screen_tiles[sx][sy] = obj;
crumbled_state[sx][sy] = crm;
}
}
* handles transparency and movement
*/
-static void blitplayer(struct PLAYER *ply)
+static void blitplayer(int nr)
{
int x1, y1, x2, y2;
- if (!ply->alive)
+ if (!ply[nr].alive)
return;
/* x1/y1 are left/top and x2/y2 are right/down part of the player movement */
- x1 = (frame * ply->oldx + (8 - frame) * ply->x) * TILEX / 8;
- y1 = (frame * ply->oldy + (8 - frame) * ply->y) * TILEY / 8;
+ x1 = PLAYER_POS_X(nr);
+ y1 = PLAYER_POS_Y(nr);
x2 = x1 + TILEX - 1;
y2 = y1 + TILEY - 1;
(int)(y2 - screen_y) < ((MAX_BUF_YSIZE - 1) * TILEY - 1))
{
/* some casts to "int" are needed because of negative calculation values */
- int dx = (int)ply->x - (int)ply->oldx;
- int dy = (int)ply->y - (int)ply->oldy;
- int old_x = (int)ply->oldx + (7 - (int)frame) * dx / 8;
- int old_y = (int)ply->oldy + (7 - (int)frame) * dy / 8;
+ int dx = (int)ply[nr].x - (int)ply[nr].oldx;
+ int dy = (int)ply[nr].y - (int)ply[nr].oldy;
+ int old_x = (int)ply[nr].oldx + (int)frame * dx / 8;
+ int old_y = (int)ply[nr].oldy + (int)frame * dy / 8;
int new_x = old_x + SIGN(dx);
int new_y = old_y + SIGN(dy);
int old_sx = old_x % MAX_BUF_XSIZE;
DrawLevelFieldCrumbled_EM(new_x, new_y, new_sx, new_sy, new_crm, FALSE);
/* draw the player (masked) over the element he is just digging away */
- DrawLevelPlayer_EM(x1, y1, ply->num, ply->anim, TRUE);
+ DrawLevelPlayer_EM(x1, y1, ply[nr].num, ply[nr].anim, TRUE);
/* draw the field the player is moving from (masked over the player) */
DrawLevelField_EM(old_x, old_y, old_sx, old_sy, TRUE);
else
{
/* draw the player under the element which is on the same field */
- DrawLevelPlayer_EM(x1, y1, ply->num, ply->anim, FALSE);
+ DrawLevelPlayer_EM(x1, y1, ply[nr].num, ply[nr].anim, FALSE);
/* draw the field the player is moving from (masked over the player) */
DrawLevelField_EM(old_x, old_y, old_sx, old_sy, TRUE);
}
/* redraw screen tiles in the next frame (player may have left the tiles) */
- screentiles[old_sx][old_sy] = -1;
- screentiles[new_sx][new_sy] = -1;
+ screen_tiles[old_sx][old_sy] = -1;
+ screen_tiles[new_sx][new_sy] = -1;
}
}
int player_nr;
int x,y;
- frame = 6;
+ frame = 1;
player_nr = (game.centered_player_nr != -1 ? game.centered_player_nr : 0);
{
for (x = 0; x < MAX_BUF_XSIZE; x++)
{
- screentiles[x][y] = -1;
+ screen_tiles[x][y] = -1;
crumbled_state[x][y] = 0;
}
}
animscreen();
for (i = 0; i < MAX_PLAYERS; i++)
- blitplayer(&ply[i]);
+ blitplayer(i);
BlitScreenToBitmap_EM(backbuffer);
BackToFront_EM();
animscreen();
for (i = 0; i < MAX_PLAYERS; i++)
- blitplayer(&ply[i]);
+ blitplayer(i);
BlitScreenToBitmap_EM(backbuffer);
BackToFront_EM();
{
for (x = 0; x < MAX_BUF_XSIZE; x++)
{
- screentiles[x][y] = -1;
+ screen_tiles[x][y] = -1;
crumbled_state[x][y] = 0;
}
}
animscreen();
for (i = 0; i < MAX_PLAYERS; i++)
- blitplayer(&ply[i]);
+ blitplayer(i);
}
projects / rocksndiamonds.git / blobdiff