From 75cfa2cbbb354fdd2bb3118c9cc9d130c7485ddb Mon Sep 17 00:00:00 2001
From: Holger Schemel <info@artsoft.org>
Date: Tue, 5 Feb 2019 08:19:53 +0100
Subject: [PATCH] removed code and image for using virtual buttons from image
 file

---
 graphics/gfx_classic/Makefile                 |   1 -
 .../gfx_classic/overlay/VirtualButtons.ilbm   | Bin 27376 -> 0 bytes
 src/libgame/sdl.c                             |  71 ------------------
 3 files changed, 72 deletions(-)
 delete mode 100644 graphics/gfx_classic/overlay/VirtualButtons.ilbm

diff --git a/graphics/gfx_classic/Makefile b/graphics/gfx_classic/Makefile
index 34b7f0fa..558a63cd 100644
--- a/graphics/gfx_classic/Makefile
+++ b/graphics/gfx_classic/Makefile
@@ -40,7 +40,6 @@ FILES = RocksBusy.$(EXT)		\
 	RocksSP.$(EXT)			\
 	RocksScreen.$(EXT)		\
 	RocksToons.$(EXT)		\
-	overlay/VirtualButtons.$(EXT)	\
 					\
 	RocksCE.$(EXT)			# dynamically generated from template
 
diff --git a/graphics/gfx_classic/overlay/VirtualButtons.ilbm b/graphics/gfx_classic/overlay/VirtualButtons.ilbm
deleted file mode 100644
index 5a394301be6fe53778213f760ec0f6744cf63295..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27376
zcmeHQKWq|F9R98(;zkDt2a|SmaA0(3f~CbjiP+kN!ATt$bkT*OLsRl%SaEV-P$$!}
z=;XklB#tDdn<E|Fz*H$oNuR%iJMP}~$`vq8G+#=~`+oP{?;Y>n`@SEK-<8{I8(HA_
zk9+si*>v{qDu64oSJn-A#wA$t*RpK9l3iXGP?uj|2O9bqN<#|JThMw4Hldp~`0n5>
zG%A@lOIM#ttt0hKD`h{vD6NO!gVIf<k4N~eQh>S!wFLDLDi5`ZW!oeVF{vTA4wbc!
z*jUbHetv#&aWR=pW-^&vE|<^e3xz_dRH{@e)oQg?t2G*pR;$%+x3$(Q8xQVCo6Gjg
zz+5tA;#+GbUVm)jCofF=a@)kkvWZ{6Gx7V6CjRu*#Pz0$_gf}DXs6d!9|6y9mJ$84
zi>^lJ5W7I?NTWU|ZA<CEF1g3d=c-(AvGlweo+Yvrla~EMoKep^I=<xeFJ8vi<57-~
zJ=Zu7I0l>tL*C_D;9B5X;979wF!BNUfP6qcARmwk$%JG=G9j6eOgI}8&ayx0we?El
zuZL65-LE}kZ`Jb_s6WZxZ}g6`S>rPh@9JMb;z-Y(0D>*qUG9q|CYIj7A|;%NB`%i!
zz!Gc|g%h%?T>K3zbmfzUkUoRQC&l6yb@89-YO82>5ar-hgDDKbKBjQNCgx@1cyK&?
ztC-V)(}B~$)ikaKt_H3Ku7*K?OEMrCkPJu$B!j`O0?B}6Kr$d1kPL!5p$rtM4b%o|
z1GRzLKy5HSB&0M_8YzvGMoJ^4k<$2YNaKYh-2^)c;wb`$po?I}RPgwuIOy-MXK|T%
zW6{XXcAF%74e^e)>ZzZSZq^*##0*P}NQkkw=iKp(n3#$SV(R<qg*HCFF(Ez=wmWk7
zyL&ro`04oSIf;7knVd|(bD9=9a(8!Ia^v>BPJPbC_z!D2i_O=o`x0hx$F?G=As3f6
zj*BGlb8c`9?0>VtdB8E?JdpQZTniin#+}}q0LF>bMsgxKk(@|Q^luJP7pM!=1?mEI
zfx19lFh4k<Hc}g@jnqbJBejv*NNo%zRxmzbe8BjC@d4ul#s`cK{?GWpm&WKOPhN!V
zhjbfan&nJF+<B?3qrBLVT2q@s-1{?e-R~pv<>KxE&Q}xpGG|BU7UJ);DLSvXj6X}7
Be|`V}

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index 45cfcd7d..4bd19873 100644
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -2885,12 +2885,8 @@ static void DrawTouchInputOverlay_ShowGridButtons(int alpha)
 
 static void DrawTouchInputOverlay(void)
 {
-  static SDL_Texture *texture = NULL;
-  static boolean initialized = FALSE;
   static boolean deactivated = TRUE;
   static boolean show_grid = FALSE;
-  static int width = 0, height = 0;
-  static int alpha_last = -1;
   static int alpha = 0;
   int alpha_max = ALPHA_FROM_TRANSPARENCY(setup.touch.transparency);
   int alpha_step = ALPHA_FADING_STEPSIZE(alpha_max);
@@ -2923,72 +2919,5 @@ static void DrawTouchInputOverlay(void)
     DrawTouchInputOverlay_ShowGrid(alpha);
 
   DrawTouchInputOverlay_ShowGridButtons(alpha);
-
-  return;
-
-
-  // !!! VIRTUAL BUTTONS FROM IMAGE FILE NOT USED ANYMORE !!!
-
-  if (!initialized)
-  {
-    char *basename = "overlay/VirtualButtons.png";
-    char *filename = getCustomImageFilename(basename);
-
-    if (filename == NULL)
-      Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename);
-
-    SDL_Surface *surface;
-
-    if ((surface = IMG_Load(filename)) == NULL)
-      Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError());
-
-    width  = surface->w;
-    height = surface->h;
-
-    // set black pixel to transparent if no alpha channel / transparent color
-    if (!SDLHasAlpha(surface) &&
-	!SDLHasColorKey(surface))
-      SDL_SetColorKey(surface, SET_TRANSPARENT_PIXEL,
-		      SDL_MapRGB(surface->format, 0x00, 0x00, 0x00));
-
-    if ((texture = SDLCreateTextureFromSurface(surface)) == NULL)
-      Error(ERR_EXIT, "SDLCreateTextureFromSurface() failed");
-
-    SDL_FreeSurface(surface);
-
-    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
-
-    initialized = TRUE;
-  }
-
-  if (alpha != alpha_last)
-    SDL_SetTextureAlphaMod(texture, alpha);
-
-  alpha_last = alpha;
-
-  float ratio_overlay = (float) width / height;
-  float ratio_screen = (float) video.screen_width / video.screen_height;
-  int width_scaled, height_scaled;
-  int xpos, ypos;
-
-  if (ratio_overlay > ratio_screen)
-  {
-    width_scaled = video.screen_width;
-    height_scaled = video.screen_height * ratio_screen / ratio_overlay;
-    xpos = 0;
-    ypos = video.screen_height - height_scaled;
-  }
-  else
-  {
-    width_scaled = video.screen_width * ratio_overlay / ratio_screen;
-    height_scaled = video.screen_height;
-    xpos = (video.screen_width - width_scaled) / 2;
-    ypos = 0;
-  }
-
-  SDL_Rect src_rect = { 0, 0, width, height };
-  SDL_Rect dst_rect = { xpos, ypos, width_scaled, height_scaled };
-
-  SDL_RenderCopy(sdl_renderer, texture, &src_rect, &dst_rect);
 }
 #endif
-- 
2.34.1