From f322fe3a5abe2c083c73e934eb29cb13d3f0bf87 Mon Sep 17 00:00:00 2001
From: sphere <spherallic@gmail.com>
Date: Tue, 23 Feb 2021 22:31:24 +0100
Subject: [PATCH] Fix weapon/team rings displaying old sprites in the 2.2
 configuration.

---
 Build/Configurations/SRB2-22.cfg |  30 +++++++++++++++---------------
 Build/Sprites/TRNGA0b.png        | Bin 0 -> 1485 bytes
 Build/Sprites/TRNGA0r.png        | Bin 0 -> 1487 bytes
 3 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 Build/Sprites/TRNGA0b.png
 create mode 100644 Build/Sprites/TRNGA0r.png

diff --git a/Build/Configurations/SRB2-22.cfg b/Build/Configurations/SRB2-22.cfg
index e20ca11..8355d7d 100644
--- a/Build/Configurations/SRB2-22.cfg
+++ b/Build/Configurations/SRB2-22.cfg
@@ -3898,79 +3898,79 @@ thingtypes
 		301
 		{
 			title = "Bounce Ring";
-			sprite = "internal:RNGBA0";
+			sprite = "RNGBA0";
 		}
 		302
 		{
 			title = "Rail Ring";
-			sprite = "internal:RNGRA0";
+			sprite = "RNGRA0";
 		}
 		303
 		{
 			title = "Infinity Ring";
-			sprite = "internal:RNGIA0";
+			sprite = "RNGIA0";
 		}
 		304
 		{
 			title = "Automatic Ring";
-			sprite = "internal:RNGAA0";
+			sprite = "RNGAA0";
 		}
 		305
 		{
 			title = "Explosion Ring";
-			sprite = "internal:RNGEA0";
+			sprite = "RNGEA0";
 		}
 		306
 		{
 			title = "Scatter Ring";
-			sprite = "internal:RNGSA0";
+			sprite = "RNGSA0";
 		}
 		307
 		{
 			title = "Grenade Ring";
-			sprite = "internal:RNGGA0";
+			sprite = "RNGGA0";
 		}
 		308
 		{
 			title = "CTF Team Ring (Red)";
-			sprite = "internal:RRNGA0";
+			sprite = "internal:TRNGA0r";
 			width = 16;
 		}
 		309
 		{
 			title = "CTF Team Ring (Blue)";
-			sprite = "internal:BRNGA0";
+			sprite = "internal:TRNGA0b";
 			width = 16;
 		}
 		330
 		{
 			title = "Bounce Ring Panel";
-			sprite = "internal:PIKBA0";
+			sprite = "PIKBA0";
 		}
 		331
 		{
 			title = "Rail Ring Panel";
-			sprite = "internal:PIKRA0";
+			sprite = "PIKRA0";
 		}
 		332
 		{
 			title = "Automatic Ring Panel";
-			sprite = "internal:PIKAA0";
+			sprite = "PIKAA0";
 		}
 		333
 		{
 			title = "Explosion Ring Panel";
-			sprite = "internal:PIKEA0";
+			sprite = "PIKEA0";
 		}
 		334
 		{
 			title = "Scatter Ring Panel";
-			sprite = "internal:PIKSA0";
+			sprite = "PIKSA0";
 		}
 		335
 		{
 			title = "Grenade Ring Panel";
-			sprite = "internal:PIKGA0";
+			sprite = "PIKGA0";
 		}
 	}
 
diff --git a/Build/Sprites/TRNGA0b.png b/Build/Sprites/TRNGA0b.png
new file mode 100644
index 0000000000000000000000000000000000000000..d86c10c65fe1082aecc5e3b8cb87aa42cafd7e35
GIT binary patch
literal 1485
zcmd^<`BRfu6owB=8-#(lVdBP8I>j_%Sj1Stek{R&Q6dR37Sv!wD4-KCq>-W~Q6U(?
zIEqF~>t_`WYST#3rVgDZC=wLf0BWr;SgmN7;yxN&YEM7;H+pB@`~Gs~o_Wr4cP`81
z2l`L*2Y|qgbe@Rvuy^wFp>AHIp@TBN!i~vt%Ewa*VTzr403TSkBs&ceJs!`)hYyE_
zhWh*adwY93J3H-myUk{^TCHZYnIuV*$z(Jd^?JQVqfx8X3WcJuuuvwGNu^SuP{`-=
z34-8qxf~8BGBPqWG?c+$(CKs<jYcIyjRs{hBnSj}4Dcs_3&0Lw1t0;802%-VfDC{S
zz@_2`9N1;T^D1nTplKdfPem0xD1yP&(6a*Cg>a4s<a{u&Ko<rTOc)uE-e^s|*ub$?
zhBo9*(x=i?ERay|pb!!6-lSh{4La2jP_t=VX&x;n<2^(dq7~7Is2sVa>$#w{om3y#
zzUme>Ifv>ko!b4DlFfTp<g0m$bE0F3nQ9c4J`oh%UbLnsImeMGI>QwliA~)Tm8hK+
zUm6jW7xK}vsUb;|8PRllm_Lo~3pfU8AH$>AC@=yb3T$uO1*2WT&&~w&nS7eH-up_t
zmDyg)iQiu1iKnP?qx3oooyb3r+~XK#xWiQZ7%Z+1ieF9(i7xNGoYK<5sHp*&%<aaG
z4zyUXwicC26p1h<2ANExh{qDQ1AGUtA3zIG03iCqhR#E1DaM05)J(w=c$5p5(}9eG
zvJWB4WV)_aw`OOXlasg4nX@wdgG{`FcnZ;gSd6%sDj^QSpdIW-;b;X^NI((~@t20d
ze8so6DPaBPi7t)Hrm&GRQZLji2!)g*O$tk52eYyLHXd@kC_O$Xt#vLeZ=PH54JWrM
zaw*;)K)W4D@=jG%cUjqmwQJ9b#b#<eTrJpk7;U>oPgg!Zro3w^ys<0SwOwql6tpP$
zrxmHkN{EKF2}T)LFOAcPIcg!hgdZtOjSv%|0`7Ez!-!)~Vn@*JW~23>mfTskcgwo!
zjX7J3MJoB?4LK?6#0jeeaniIXL1F~DJ!4%7qo$;=wQ4Vb7nF-K#T4xS`dAX~v#FIG
zSDOBr5+GpGJ9)uZUo)u!i8FY~+4Jix`+9fpi1texL3`1xaMp7{OeITYxtmXVK3y_7
zvrRYfLsab5-><E&+n;c{?)*eaK@uma;YqV_=Io`U)-dCZ*Mv)tx7G~%H%0daXQelK
z-^r*SN$h+1bN&0VCG`)Cqt#17FQhIi_YS1}wP|$y$U?)Bd;tXdxvkH6)3){IL%00x
zN~iLRUBj?o!4aK;Ua|S)*&qk+sKfK^tZ@0b+iirG>*ey5=zXnA^7rwZuVpa%b<W_&
zwUHgtXY{V=du9kf`L%H?OXn@=&g^cRc9pAT2JFr{M!R=^%9?-YuZt-*PF!PhzxtBr
zW!xZtlhXWF#=984gEKtfn@9K6I_4SX1~pdoWrg^rw8yqTo$+c#PxOYL#@~=nDEPcc
zcXo@AEiPaM9-eZD;nWYrl&AMU!MP6Ai|U(<7hUqvdkYmOI6=SY@)94_5&yjPIptY>
U;A$6(`u+ei(lUA9r{rz>52=qCF#rGn

literal 0
HcmV?d00001

diff --git a/Build/Sprites/TRNGA0r.png b/Build/Sprites/TRNGA0r.png
new file mode 100644
index 0000000000000000000000000000000000000000..8119fd93c2b9108aa03c70c503d06ff5f8e09d64
GIT binary patch
literal 1487
zcmd^;|5MU;9LHa3h3OgIoI!PgshbruEK^$9eNbWeWr+bs(+a97DLFLssI<WO1r?KB
zS>&u}_61iXBrC4D3o8ev-PCrSWoKzx=E~LjVy&)T`{ci|_ucdL{N;VG*FB!^*Sjh;
zMd0T%+Xn#r5)*hL(t|$A+l#Ec<JB(GycOGGH<9j7ia{5<^#ERw`n80Qh!YbN<KyEa
zBP0F&{k^@t9UUD`r_<qZ*lae7#bP#_O(v7kXw>WVTCG;2(Wq1^g+d{d$)r-LP$(1#
z1O!2FI2<;c9TpbGWHM<q8kI_=P$=Xu)M`;CLxMnnrvUc=x&fR3HUKk#5kL!|0+0a+
z0666RJ8jry!i$C2l!m5gteAy`@FW`sHbBo>XcxkH9+;Ow^#Ujff*o{td`H^X8h^Ec
zZ7X6nWCZBrDTNCljqHO$L>RtJz1BM8RD*Bj_UU<YN_yf{#BM|zq7hO3_-;wh6`kW}
z&4JSOcd^MmQfKYZ?YAn6_pbd`!%Iq!SVGLzpfK-Qa`xa?8+&5Y+hRn`oaCcR;(rK_
z(an#_3kjDqK2M#+;C@Prpi+Z;DAXx{laS6yJd%wBBLKp|@oqHhbywi?X5SkoFT2ij
zpVCt;@mNFr@fJ`1gN36gy@^6M3N9k&1O`<P(Nz}$#T7H6)=(G`1-;keT3Tq8l^~Oi
zj-tzjRx8%jpjwS05iVYgbUKp6lY`p<egW7IpaaMP5Z!X1yB@7Mc#wzMnW%)nGvHbR
zm?I%S6jqx|H#M48iNq2cTe@h`x_QAV*ok-wu^KT4F^P;22VlSn&PHh50XxzlEefK3
ze*~7!DK$;LTZ=#G)^<Bo4ztXx7wT1nO3IdUgSf0f7Pb#!ecP+N69dv3_sRnM(yYVm
zjPkHm`0x%oooF@>m6u=7&%d&H^Leq@Las-53tm2g4#VryMNf~ZhfRt;Lq>P0*jbd^
zq86N1#UE1=4VzaOWgNXUQY&U_ge;{XOcoy^CYZ^bIRu*)$qHbFP@NW|?V!$FmA`ja
zX2rJj-8rJdO-Z@wahc*3>ysm;{P5(M5FDMDe3c+_OBAi;djUM4K$IdTVgJ|1y5b>=
z{Ib*Y624Ib_y&BG2mE-5P6m{g$cvRM+hg6gv9>J2yZrI0rFCV;b?!&+Rp*SNzU3(s
zeV3R4<+i~#<?WgE*~**?uFk_ZUF)hAMjoXdUG?UcWyXP%LN34dy{_`UhTs)UmC(nk
z=ZA_)o`rT6GO~*|Bze_GB~7@C;!jeC=7lUTsqo7Gt?0rl20!)eXS!)+FQhwz{Vs1=
z0$KLmXNJFQ<rl!*xjk(Teat0EIz=A5TK+Dz&fh-e*`QgcC}y3}di?cZ;j0^4-?L%n
zF6(!Ju7F|IzxoG$3AL6(St4g0w`5^f*hBfAu{qqDsqUuU(rs!(g!a%``guWBbJvUF
zm5n-gw0+l4w?42Nhy1V5Ugml>Q#`ryIsDm_8*yXvsh;yT&APw6w)l%J2cy?jD(&8p
z=gx8aFIo04XsMefG+Z|fUmd3}56yj}ojv&L&Z|!hZ!_)ho*&`-Nu%83MlfExm>)iP
Xyd0Agp@xB4GIdDgr|{0i$-n;(d<7b!

literal 0
HcmV?d00001