From 1bff78ae3736ceae4c108024b11a1bf3805933e5 Mon Sep 17 00:00:00 2001
From: earth-metal <38820385+earth-metal@users.noreply.github.com>
Date: Wed, 26 Sep 2018 22:21:32 -0400
Subject: [PATCH 1/3] Use a generic path for loading *.chn files.

---
 src/g_ctf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/g_ctf.c b/src/g_ctf.c
index ff334c0..19428b3 100644
--- a/src/g_ctf.c
+++ b/src/g_ctf.c
@@ -3010,8 +3010,8 @@ void CTFSetupNavSpawn()
 	memset(Route,0,sizeof(Route));
 	memset(code,0,8);
 
-	if(!ctf->value) sprintf(name,".\\%s\\chdtm\\%s.chn",gamepath->string,level.mapname);
-	else sprintf(name,".\\%s\\chctf\\%s.chf",gamepath->string,level.mapname);
+	if(!ctf->value) sprintf(name,"%s/chdtm/%s.chn",gamepath->string,level.mapname);
+	else sprintf(name,"%s/chctf/%s.chf",gamepath->string,level.mapname);
 
 	fpout = fopen(name,"rb");
 	if(fpout == NULL)

From f2c7daaa3bb68a1cda3af526e8f40406ef5916f1 Mon Sep 17 00:00:00 2001
From: earth-metal <38820385+earth-metal@users.noreply.github.com>
Date: Wed, 26 Sep 2018 22:23:16 -0400
Subject: [PATCH 2/3] Original "addbot.cfg" asset added.

---
 misc/assets.zip | Bin 1434017 -> 1434880 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/misc/assets.zip b/misc/assets.zip
index db3a8c7b9154c2fbb736d4dc5e96503a9111a219..45647983efaf574c047e1cb723cd4590a63b7fde 100644
GIT binary patch
delta 941
zcmZ2@IK1IhctZ<g3sVbo3rh=Y3tJ0&3r7oQ3s(zw3r`Dg3ttO=i$IHDi%^Sji^vvH
z-oy3GEFugH3>*w<o<&aA+YZb;$i%>)%g4aL&mhBKT$N;`pO})8lwYEkoR%IM!pXq=
zL(o0&mGzqF(h6<{MwS=M3=Cjm>D7yQvkgSp9=!gl>9=$4H4$l^z;$6OC$GxAdS$Em
z>}97|RxM!aGsv8>U0(6VkA(ac5A`<H+g&iMe;BW$=RNV6KKlb+nIr4iHm+ZA?&)jQ
z0?wb@9a_yQ`3j;lTf9s*h=0{KnayLi=)?kxbx&LuZr2m*p0xa}Df^CnY2l~u^M5)m
zUm<9EA>O>aykO#!P_FoToBuz)eG#^qx2!Y6X78`R@BZzGd3M!rQSa^F$8WQL&{Ev2
z6un(~&xzah>Qh2r6@S>qYVR=f^w&jaR?V&7`aC~PNmBiU#YQ>x7aERd4wU`fb9+|f
z_1tauI6i#1ysAC6v^*ekD_30k*~w=fC~x`vlck^O*V^72&L>wh-|293QeH6kvSD!g
z(u&g?%B2)P90}*{yw4~0e&Rc+eW$c%UhUogD(~-3*T0W-!<KKUpJg?rbN$zr2nkmS
zNrOwa@9RyoG8r$uSa2~@cf%He%!3P9FGpo$@?<_-(0W;F^A?WGoC`O$h($*AY{|H=
zC{uUa7S&6S9J`lqUApw=-m+iuJP}vx{H~P#U2XC2@(JDh;dXq2=^YOQO4~H}SkDDC
zI4?97c_dKWCc)==E}+GEqj9~+>wbT8fe%lje;YUEZE^9vW;gBX4~+@VTb$D@L##`t
z31_I!c-nG{Gu_h1I%k@2ruwX>M{afAe_OL-LvU8+3XbIOAwnm;)@AQ|YyD_pwoHid
zx5d+(JtbsJEt@PtMD+Tt_8j=4@#)1Baf>|{zA!yu4UT*9VaChW6Wq&fo_$cdT%UX*
zIXLdghosBh6U2QhHy)0j71y(;;#9Pi&HnFaF1@hbZ0?u;{KxE>X*(?Z^zYgSu`FHl
z=tZ!|(lyUs1T%U?UcI>7Y09Qui~S9!Y&x~r-&G@ZtNZ**e;2A<uJwFX<kr06W#-E_
ze1XE(F5T2!<mc#}{=LIWQ+MuNl~*QPOUkCN;1j-n>1OVtdtADE_xt~2+RlAgv`KDy
yz-dvgc+4Cj0n8~342(d$r4gtQGk>r`@&{Vp2=HcQ18EEc!mDx&45G(Gfjj`qIHt`2

delta 78
zcmWN^$qj%Y6aZ0Na6?=n-ssBE&Ob~e_F!TGBp$3v=AA~qc%>*5lvLDc8d^Gf1`H#X
ciJ66!jU9J;o1WwK5}a;S?#v`8Ws=YL1KjWxDF6Tf


From b28d18c3d3a67a4b40feb98cd1a8ed4a7100f596 Mon Sep 17 00:00:00 2001
From: earth-metal <38820385+earth-metal@users.noreply.github.com>
Date: Thu, 27 Sep 2018 08:20:46 -0400
Subject: [PATCH 3/3] Improve recognition of lines with bot-characters in
 3ZBConfig.

The original formatting of 3ZBConfig was causing 3 "blank" bot
characters to be loaded into the initial slots of the list of bot
characters.  Decrementing the counter when it reaches an improperly
formatted line prevents this.
---
 src/bot_func.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/bot_func.c b/src/bot_func.c
index 3a91d22..7161786 100644
--- a/src/bot_func.c
+++ b/src/bot_func.c
@@ -142,7 +142,11 @@ MESS_NOTFOUND:
 			if(Buff[0] == '[') break;
 			if(Buff[0] == '\n' || Buff[0] == '#') {i--;continue;}
 			j = 2,k = 1;
-			if(!strncmp(Buff,"\\\\",2))
+			if(strncmp(Buff,"\\\\",2))
+			{
+				i--;
+			}
+			else
 			{
 				//netname
 				if(Get_YenPos(Buff,&k))