rnd-20040823-2-src

[rocksndiamonds.git] / src / game_em / graphics.c

diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c
index 70c45c5393c897cdbce907ec87d7defc02cbc936..edc1564336ba694eafd70df79cedbf811d3a80bf 100644 (file)
--- a/src/game_em/graphics.c
+++ b/src/game_em/graphics.c
@@ -110,11 +110,13 @@ void blitscreen(void)
               SX + MAX_BUF_XSIZE * TILEX - x, SY + MAX_BUF_YSIZE * TILEY - y);
   }
 
-  /* draw either the main menu footer or the in-game time/gems/score values */
-
-  if (em_game_status == EM_GAME_STATUS_PLAY)
+  if (em_game_status == EM_GAME_STATUS_PLAY && SCR_FIELDY < 17)
+  {
     BlitBitmap(scoreBitmap, window, 0, 0, SCR_FIELDX * TILEX, SCOREY,
-              SX, SY + SCR_FIELDY * TILEY - SCOREY);
+              SX, SY + SCR_FIELDY * TILEY);
+    ClearRectangle(window, SX, SY + SCR_FIELDY * TILEY + SCOREY,
+                  SCR_FIELDX * TILEX, (17 - SCR_FIELDY) * TILEY - SCOREY);
+  }
 
   XFlush(display);
 
@@ -332,16 +334,22 @@ void game_blitscore(void)
 
   xdebug("game_blitscore");
 
+  DrawGameDoorValues_EM(lev.required, ply1.dynamite, lev.score,
+                       (lev.time + 4) / 5);
+
   i = (lev.time + 4) / 5;
   BlitBitmap(botBitmap, scoreBitmap,
             (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY,
-            7 * SCOREX, 0); i /= 10;
+            7 * SCOREX, 0);
+  i /= 10;
   BlitBitmap(botBitmap, scoreBitmap,
             (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY,
-            6 * SCOREX, 0); i /= 10;
+            6 * SCOREX, 0);
+  i /= 10;
   BlitBitmap(botBitmap, scoreBitmap,
             (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY,
-            5 * SCOREX, 0); i /= 10;
+            5 * SCOREX, 0);
+  i /= 10;
   BlitBitmap(botBitmap, scoreBitmap,
             (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY,
             4 * SCOREX, 0);
@@ -349,13 +357,16 @@ void game_blitscore(void)
   i = lev.score;
   BlitBitmap(botBitmap, scoreBitmap,
             (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY,
-            31 * SCOREX, 0); i /= 10;
+            31 * SCOREX, 0);
+  i /= 10;
   BlitBitmap(botBitmap, scoreBitmap,
             (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY,
-            30 * SCOREX, 0); i /= 10;
+            30 * SCOREX, 0);
+  i /= 10;
   BlitBitmap(botBitmap, scoreBitmap,
             (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY,
-            29 * SCOREX, 0); i /= 10;
+            29 * SCOREX, 0);
+  i /= 10;
   BlitBitmap(botBitmap, scoreBitmap,
             (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY,
             28 * SCOREX, 0);
@@ -557,17 +568,6 @@ void title_blitscore(void)
 #endif
 }
 
-void title_blitants(unsigned int y)
-{
-  static const char ants_dashes[2] = { 8, 7 };
-
-  xdebug("title_blitants");
-
-  XSetDashes(display, antsGC, colour_anim, ants_dashes, 2);
-  XDrawRectangle(display, screenPixmap, antsGC,
-                0, y * TILEY, SCR_MENUX * TILEX - 1, TILEY - 1);
-}
-
 void title_animscreen(void)
 {
   blitscreen();