major cleanup of preprocessor hell

[rocksndiamonds.git] / src / game_sp / DDSpriteBuffer.c

diff --git a/src/game_sp/DDSpriteBuffer.c b/src/game_sp/DDSpriteBuffer.c
index 39f04e76011c4101cfeb8821e0181b28446ae9e6..e2f47eee2195a554e31a49720aea0642bf89e06f 100644 (file)
--- a/src/game_sp/DDSpriteBuffer.c
+++ b/src/game_sp/DDSpriteBuffer.c
@@ -5,31 +5,20 @@
 #include "DDSpriteBuffer.h"
 
 
-long mXSpriteCount, mYSpriteCount;
-long mSpriteWidth, mSpriteHeight;
-long mDestXOff, mDestYOff;
-
-void DDSpriteBuffer_Init()
-{
-  mSpriteWidth  = TILEX;
-  mSpriteHeight = TILEY;
-  mXSpriteCount = 16;
-  mYSpriteCount = 16;
-}
-
 static void Blt(int pX, int pY, Bitmap *bitmap, int SpriteX, int SpriteY)
 {
-  MyRECT DR, SR;
-
   int scx = (mScrollX_last < 0 ? 0 : mScrollX_last);
   int scy = (mScrollY_last < 0 ? 0 : mScrollY_last);
   int sx1 = scx - 2 * TILEX;
   int sy1 = scy - 2 * TILEY;
-  int sx2 = scx + SXSIZE + 1 * TILEX;
-  int sy2 = scy + SYSIZE + 1 * TILEY;
-
+  int sx2 = scx + (SCR_FIELDX + 1) * TILEX;
+  int sy2 = scy + (SCR_FIELDY + 1) * TILEY;
   int sx = pX - sx1;
   int sy = pY - sy1;
+  int tile_x = sx / TILESIZE;
+  int tile_y = sy / TILESIZE;
+  int move_x = (sx + TILESIZE - 1) / TILESIZE;
+  int move_y = (sy + TILESIZE - 1) / TILESIZE;
 
   if (NoDisplayFlag)
     return;
@@ -38,20 +27,25 @@ static void Blt(int pX, int pY, Bitmap *bitmap, int SpriteX, int SpriteY)
   if (pX < sx1 || pX > sx2 || pY < sy1 || pY > sy2)
     return;
 
-  DR.left = pX + mDestXOff;
-  DR.top = pY + mDestYOff;
-  DR.right = pX + mSpriteWidth + mDestXOff;
-  DR.bottom = pY + mSpriteHeight + mDestYOff;
-
-  SR.left = SpriteX;
-  SR.top = SpriteY;
-  SR.right = SR.left + mSpriteWidth;
-  SR.bottom = SR.top + mSpriteHeight;
-
-  BlitBitmap(bitmap, screenBitmap,
-            SR.left, SR.top,
-            mSpriteWidth, mSpriteHeight,
-            sx, sy);
+  sx = sx * TILESIZE_VAR / TILESIZE;
+  sy = sy * TILESIZE_VAR / TILESIZE;
+
+  BlitBitmap(bitmap, bitmap_db_field_sp, SpriteX, SpriteY,
+            TILEX_VAR, TILEY_VAR, sx, sy);
+
+  redraw[tile_x][tile_y] = TRUE;
+  redraw_tiles++;
+
+  if (move_x != tile_x)
+  {
+    redraw[move_x][tile_y] = TRUE;
+    redraw_tiles++;
+  }
+  else if (move_y != tile_y)
+  {
+    redraw[tile_x][move_y] = TRUE;
+    redraw_tiles++;
+  }
 }
 
 void DDSpriteBuffer_BltImg(int pX, int pY, int graphic, int sync_frame)