cleanup: remove FD_UpdateRect[s]() wrappers

Author: ReinhardPrix

src/graphics.c

@@ -1437,7 +1437,7 @@ white_noise (SDL_Surface *bitmap, SDL_Rect *rect, int timeout)
       SDL_SetClipRect (ne_screen, NULL);
       // set it
       SDL_BlitSurface (noise_tiles[next_tile], NULL, ne_screen, rect);
-      FD_UpdateRect (ne_screen, rect->x, rect->y, rect->w, rect->h);
+      SDL_UpdateWindowSurfaceRects (FD_GetWindow(), rect, 1);
       SDL_Delay(25);
 
       if ( (timeout != 0) && ((int)(SDL_GetTicks() - now) > timeout) )

src/misc.c

@@ -1198,7 +1198,7 @@ update_progress (int percent)
   //  Fill_Rect (dst, progress_color);
   SDL_BlitSurface (progress_filler_pic, &src, ne_screen, &dst);
 
-  FD_UpdateRects (ne_screen, 1, &dst);
+  SDL_UpdateWindowSurfaceRects (FD_GetWindow(), &dst, 1);
 
   return;
 

src/sdl_compat.c

@@ -26,42 +26,6 @@ FD_SetVideoMode(int width, int height, int bpp, Uint32 flags)
 	return SDL_GetWindowSurface(fd_window);
 }
 
-void
-FD_UpdateRect(SDL_Surface *screen, Sint32 x, Sint32 y, Uint32 w, Uint32 h)
-{
-	SDL_Rect rect;
-
-	(void)screen;
-	if (!fd_window)
-		return;
-
-	if (w == 0 || h == 0)
-	{
-		SDL_UpdateWindowSurface(fd_window);
-		return;
-	}
-
-	rect.x = x;
-	rect.y = y;
-	rect.w = w;
-	rect.h = h;
-	SDL_UpdateWindowSurfaceRects(fd_window, &rect, 1);
-}
-
-void
-FD_UpdateRects(SDL_Surface *screen, int numrects, SDL_Rect *rects)
-{
-	(void)screen;
-	if (!fd_window)
-		return;
-	if (numrects <= 0 || !rects)
-	{
-		SDL_UpdateWindowSurface(fd_window);
-		return;
-	}
-	SDL_UpdateWindowSurfaceRects(fd_window, rects, numrects);
-}
-
 SDL_Window *
 FD_GetWindow(void)
 {

src/sdl_compat.h

@@ -8,8 +8,6 @@ extern "C" {
 #endif
 
 SDL_Surface *FD_SetVideoMode(int width, int height, int bpp, Uint32 flags);
-void FD_UpdateRect(SDL_Surface *screen, Sint32 x, Sint32 y, Uint32 w, Uint32 h);
-void FD_UpdateRects(SDL_Surface *screen, int numrects, SDL_Rect *rects);
 SDL_Window *FD_GetWindow(void);
 void FD_DestroyWindow(void);
 

src/ship.c

@@ -806,8 +806,8 @@ Sensors  1: %s\n\
 
   if (flags & UPDATE_ONLY)
     {
-      FD_UpdateRects (ne_screen, 1, &Cons_Header_Rect);
-      FD_UpdateRects (ne_screen, 1, &Cons_Text_Rect);
+      SDL_UpdateWindowSurfaceRects (FD_GetWindow(), &Cons_Header_Rect, 1);
+      SDL_UpdateWindowSurfaceRects (FD_GetWindow(), &Cons_Text_Rect, 1);
     }
   else
     SDL_UpdateWindowSurface(FD_GetWindow());
@@ -918,7 +918,7 @@ show_droid_portrait (SDL_Rect dst, int droid_type, float cycle_time, int flags)
       SDL_BlitSurface (droid_background, NULL, ne_screen, &dst);
       SDL_BlitSurface (droid_pics, &src_rect, ne_screen, &dst);
 
-      FD_UpdateRects (ne_screen, 1, &dst);
+      SDL_UpdateWindowSurfaceRects (FD_GetWindow(), &dst, 1);
 
       last_frame_time = SDL_GetTicks();
     }

src/text.c

@@ -692,7 +692,15 @@ printf_SDL (SDL_Surface *screen, int x, int y, const char *fmt, ...)
   PutString (screen, x, y, TextBuffer);
   h = FontHeight (GetCurrentFont()) + 2;
 
-  FD_UpdateRect (screen, x, y, textlen, h);  // update the relevant line
+  if (screen == ne_screen)
+    {
+      SDL_Rect dst;
+      dst.x = x;
+      dst.y = y;
+      dst.w = textlen;
+      dst.h = h;
+      SDL_UpdateWindowSurfaceRects (FD_GetWindow(), &dst, 1);  // update the relevant line
+    }
 
   if (TextBuffer[strlen(TextBuffer)-1] == '\n')
     {

src/view.c

@@ -228,8 +228,8 @@ Assemble_Combat_Picture (int mask)
 
   if ( mask & DO_SCREEN_UPDATE )
     {
-      FD_UpdateRect (ne_screen, User_Rect.x, User_Rect.y, User_Rect.w, User_Rect.h);
-      FD_UpdateRect (ne_screen, TxtRect.x, TxtRect.y, TxtRect.w, TxtRect.h);
+      SDL_UpdateWindowSurfaceRects (FD_GetWindow(), &User_Rect, 1);
+      SDL_UpdateWindowSurfaceRects (FD_GetWindow(), &TxtRect, 1);
     }
 
   SDL_SetClipRect (ne_screen, NULL);
@@ -724,7 +724,14 @@ DisplayBanner (const char* left, const char* right,  int flags )
 
       // finally update the whole top status box
       if ( !(flags & BANNER_NO_SDL_UPDATE ) )
-	FD_UpdateRect( ne_screen, 0, 0, Banner_Rect.w , Banner_Rect.h );
+	{
+	  SDL_Rect update_rect;
+	  update_rect.x = 0;
+	  update_rect.y = 0;
+	  update_rect.w = Banner_Rect.w;
+	  update_rect.h = Banner_Rect.h;
+	  SDL_UpdateWindowSurfaceRects (FD_GetWindow(), &update_rect, 1);
+	}
       BannerIsDestroyed=FALSE;
       return;
     } /* if */