X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fgadgets.c;h=a371bb473505a3f8eccfd5425d8e4a7c68d8e10c;hb=5f926b2dd808d7336f7ec63499fb0776e8513e97;hp=9dfea83896e25a33d61c3a90899d8e28e40a158d;hpb=14089dac2cbe56e563863e1e5adb8847944fd262;p=rocksndiamonds.git

diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c
index 9dfea838..a371bb47 100644
--- a/src/libgame/gadgets.c
+++ b/src/libgame/gadgets.c
@@ -202,15 +202,16 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
 				 gd->x, gd->y + gi->border.size,
 				 gi->width, design_body,
-				 xpos, ypos + gi->border.size
-				 + i * design_body);
+				 xpos,
+				 ypos + gi->border.size + i * design_body);
 
 	/* remaining middle part of gadget */
 	if (step_size_remain > 0)
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
 				 gd->x,  gd->y + gi->border.size,
 				 gi->width, step_size_remain,
-				 xpos, ypos + gi->border.size
+				 xpos,
+				 ypos + gi->border.size
 				 + num_steps * design_body);
 
 	/* lower part of gadget */
@@ -234,33 +235,37 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 	int step_size_remain = size_body - num_steps * design_body;
 
 	/* clear scrollbar area */
-	ClearRectangle(backbuffer, gi->x, gi->y, gi->width, gi->height);
+	ClearRectangleOnBackground(backbuffer, gi->x, gi->y,
+				   gi->width, gi->height);
 
 	/* left part of gadget */
-	BlitBitmap(gd->bitmap, drawto,
-		   gd->x, gd->y,
-		   gi->border.size, gi->height,
-		   xpos, ypos);
+	BlitBitmapOnBackground(gd->bitmap, drawto,
+			       gd->x, gd->y,
+			       gi->border.size, gi->height,
+			       xpos, ypos);
 
 	/* middle part of gadget */
 	for (i=0; i<num_steps; i++)
-	  BlitBitmap(gd->bitmap, drawto,
-		     gd->x + gi->border.size, gd->y,
-		     design_body, gi->height,
-		     xpos + gi->border.size + i * design_body, ypos);
+	  BlitBitmapOnBackground(gd->bitmap, drawto,
+				 gd->x + gi->border.size, gd->y,
+				 design_body, gi->height,
+				 xpos + gi->border.size + i * design_body,
+				 ypos);
 
 	/* remaining middle part of gadget */
 	if (step_size_remain > 0)
-	  BlitBitmap(gd->bitmap, drawto,
-		     gd->x + gi->border.size, gd->y,
-		     step_size_remain, gi->height,
-		     xpos + gi->border.size + num_steps * design_body, ypos);
+	  BlitBitmapOnBackground(gd->bitmap, drawto,
+				 gd->x + gi->border.size, gd->y,
+				 step_size_remain, gi->height,
+				 xpos + gi->border.size
+				 + num_steps * design_body,
+				 ypos);
 
 	/* right part of gadget */
-	BlitBitmap(gd->bitmap, drawto,
-		   gd->x + design_full - gi->border.size, gd->y,
-		   gi->border.size, gi->height,
-		   xpos + size_full - gi->border.size, ypos);
+	BlitBitmapOnBackground(gd->bitmap, drawto,
+			       gd->x + design_full - gi->border.size, gd->y,
+			       gi->border.size, gi->height,
+			       xpos + size_full - gi->border.size, ypos);
       }
       break;
 
@@ -613,7 +618,7 @@ void FreeGadget(struct GadgetInfo *gi)
 {
   struct GadgetInfo *gi_previous = gadget_list_first_entry;
 
-  while (gi_previous && gi_previous->next != gi)
+  while (gi_previous != NULL && gi_previous->next != gi)
     gi_previous = gi_previous->next;
 
   if (gi == gadget_list_first_entry)
@@ -622,7 +627,7 @@ void FreeGadget(struct GadgetInfo *gi)
   if (gi == gadget_list_last_entry)
     gadget_list_last_entry = gi_previous;
 
-  if (gi_previous)
+  if (gi_previous != NULL)
     gi_previous->next = gi->next;
 
   free(gi);