From 1aa6ec30ed5e7751188ffa7ab70f0171802d7999 Mon Sep 17 00:00:00 2001
From: Alexander Kromm <mmaulwurff@gmail.com>
Date: Thu, 13 Aug 2020 20:30:35 +0700
Subject: [PATCH] fix sprite conflict with Reelism 2

---
 acs/weapon-menu.o                       | Bin 177540 -> 177540 bytes
 source/weapon-menu.acs                  |   2 +-
 sprites/{wmbgleft.png => wm_bgleft.png} | Bin
 textures.txt                            |   4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename sprites/{wmbgleft.png => wm_bgleft.png} (100%)

diff --git a/acs/weapon-menu.o b/acs/weapon-menu.o
index 09a5b6447907bc994b09f9f9d68627134bc408fd..b8c9302dd7b5cd8d8a899b0f905e965903617241 100644
GIT binary patch
delta 269
zcmWN@JqQ7D7{K9|Zn}~(7)_F|$-rh}Fc=L|gyG628GMw%)hz~Pp!^q$#UdvrgOW|z
zOiCton^~RT@YG{Ey6NcKU~bfoigYl5355f0c)>+5CXzxPWpvTQ029ox!WuiAaK{@G
z7x5v23<_vqh-q9}vLsua@x&M2goqzuq)|s778Ewv<AN(5aPUJQDH25%C6rM?)pm1>
Vkf&zPo0>LOhNTS8Q5oJ(@eg`6Hpu`0

delta 267
zcmWN@F$e)+7=YoAOp-D%S|l8cfz5V<#b%IFWVkX(2F_q027@wP{>5Ukpi35ml1<r6
zN=8g(g?D)B>A&3lmwOe^yY;9@115S<*x-a4zVOFHlF(5=6D^n+VS*XvSYwAX?)br@
ziG-0x78P_b)}$s=vcw)&yy1w8co9MhWwbGX!U8r9IO2jQKJX<(BFG?*0*WZvKivx2
SR@LR|DPyP%$5t86NA3@mr8g`9

diff --git a/source/weapon-menu.acs b/source/weapon-menu.acs
index aa50e42..e9bda7b 100644
--- a/source/weapon-menu.acs
+++ b/source/weapon-menu.acs
@@ -341,7 +341,7 @@ function void WM_MaybeShowBackground(int backgroundMode, int playerN)
   switch (backgroundMode)
   {
   case BACKGROUND_LEFT:
-    SetFont("wmbgleft");
+    SetFont("wm_bgleft");
     SetHudSize(600, 1, true);
     HudMessage(s:"A"; msgFlags, msgIdBackground,  0, 0.0, -1.0, 0);
     HudMessage(s:"A"; msgFlags, msgIdBackgroundA, 0, 0.0,  0.0, 0);
diff --git a/sprites/wmbgleft.png b/sprites/wm_bgleft.png
similarity index 100%
rename from sprites/wmbgleft.png
rename to sprites/wm_bgleft.png
diff --git a/textures.txt b/textures.txt
index 62299ed..2a60382 100644
--- a/textures.txt
+++ b/textures.txt
@@ -409,7 +409,7 @@ sprite optional wm_drla_unarmed, 512, 512
 
 graphic wmbgrght, 200, 1
 {
-  graphic wmbgleft, 0, 0
+  graphic wm_bgleft, 0, 0
   {
     FlipX
   }
@@ -417,7 +417,7 @@ graphic wmbgrght, 200, 1
 
 graphic wmbgtop, 1, 200
 {
-  graphic wmbgleft, 0, 0
+  graphic wm_bgleft, 0, 0
   {
     Rotate 90
   }