From 9209adbba9518ed812411d26201e2f2c816fe796 Mon Sep 17 00:00:00 2001
From: Bitl <bitlblox@gmail.com>
Date: Sat, 19 Oct 2019 13:02:01 -0700
Subject: [PATCH] fixes

---
 NovetusLauncher/.vs/NovetusLauncher/v14/.suo | Bin 151552 -> 150016 bytes
 NovetusLauncher/NovetusCMD/Program.cs        |  19 ++++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/NovetusLauncher/.vs/NovetusLauncher/v14/.suo b/NovetusLauncher/.vs/NovetusLauncher/v14/.suo
index fb41a01612ab9e9a23489666aff6fe4e59250dbc..48d120089df5c6187c8b13ee7a7ad434b91ad375 100644
GIT binary patch
delta 4522
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
N+q0h+OXjkU{{Y4lBC7xZ

delta 5259
zcmbVQ3sjWH75?w+F3;utMuM;)DzIi37Fgd4yC51~Dw@Psvao<CEC>r4L|A+sO|6j~
z!sMY<NkY;jHOi*`)fh`++Pq9^ta&y`F|lddnw*$o&(T)5cYau0AN80H=i8aNGjr$u
z-`wwiVDIs@@AKU?BPLD|1R3J0%jLpKYEQsAikj2X4mH}rL5e_66Uq2MgI_oK_0|tz
z8V(!g&^E6&5(o5Oq{FKXEjmKmWNiU*5QH<~*vH~UK_1nafvp4tZs5{k9gPS<Xb}oT
zEP{{uW9^OLkwjuW9TAL(M_fT$DAr*JKCZ$#05K7fj3BtHAJ$0-C1N}x9f9knxe~E4
z386;dTB)R9`w(IZVycJT7u(|yS%?Uln;PbuiLL#J82X)jEv)0TbT^jKAw}INEoB#<
z7^6j)E76j4BQ2etw76sNLa+S7_yzIeChBgqk62tTP84s;vDPE_TsKkNek-C<aULg%
zkMn{=bza9*HV$&8Gzbr-t|N*w9E7-$s0g(2lk-7LMsT9|CVR2wC(8rO!Fr4~Y|j+v
zkMbr@?h+izgvkN?&=CFzC4w*I2=Zu4Hab^nq~Y@5LyZ>rsS78LEW|txF7)BS;|4C;
z9hpo*fwl&BkPtkp;Nk$u&I2DC561D34rL%lvk2|HI08=u2>d8`j=3k&;lMH_&m(t!
zaqrX?R2l$$3MYGPs;w-ZhK5$aeA*J)39<Ad{?4E+VVj_kUJ6-%YkSqa03jE>7(F~W
zZPld^05j0UQ($a^;hJ=3LS7OCNQcYiH8x~3?r@ZypeG`=&_XYkl>|Wk=&*YVG}D&(
zopDWQ=EuuR7h)sAeKyWuKMkaRfR@vUKO)W`K16(k_!z-wev0*H2p{B**7^7J#S@3c
zL`^b{({}O{QSzkW$>ZLb+7^~lqfG1j6dK=02+k{sGU8Z?bkD>dPsFjg!z=&5=PIJn
z`6tdx6TJxwoey#1=Vg!#%&-s!9nmHwziaR%yzm2Y+M;&=UGU2yI<!{hv`%q=oJUIK
z`fa|+=xG8X#d#>Z6uKMZ9DypQD&tF8UlRnY&fXvWjB<}7duY?IUOq5wm<4+i4IOOM
zft9o6UymD&vPE6_EwG8U6uduj^jzTX{i)4arksO@L=R&e4*~m9aZ}9e7_`vf*z%DW
zSH_-+E<=mwjPlVwEgx5BSmQBh^Jw!0>#+aOsBJyg?T8JC4n!xyj$j`|!2~uT9LDhz
z6Y`4-%2{DJ=tV;~*r9Kh+!6Pd55GwF)i{Ual+b4)j&doX=y17Ru@=X-(1#YSSF~a)
z*m-G=x7?AMAm5HXnp}|pSG&zQv^`ZBbJwUR?yVo&&mx{fgwy@0Nj?ME0t|zmOkGJI
zOiS->Os6~2YWba6;tHHsiwR+8Bf%ufBjK3LQDD0*>paapMWW!e2=r3TJ0sb}PsM#<
zba>?%pF$6VJI(I(mOncf19HdWH|QIY8t3q0C3woIROvogx2q8~`Fp5|x|X)UBHFUd
z1q*4*@=jPlFD_r`!yjPoMP8p^Cmm?piVkvQF}=Lvvj1kZoa0Is1o5}y0Z89b!Uhu|
zmc^<d1q7C>g4qD<H5C}ypbElo{Ao;r^xh<tMYZv^Hxf^k`G1ew4e>oui>?Ncv%$N-
zPVLEdYDhLXCcI8JTMSe~yl7$FI>>XrRyP|Q=}SWP4Ro}orSA>8dZq3uThM<F3wWeq
zP{myHp{q{~eWw%p9ML~jR^4lh>ClE~XK%+6pvPaxqZ=)Gd~auA-7#=_?YSJ@uYq8?
zYm38K)O*y6%B{h^FXK~iUfx1uIla)?Njq|V=+jn};+2nv9(&yR?&%|h9@{tItZUuu
z+xMc}`9miOq_%YltjGc?r|IA^ps)9?aF*=s^LD<z=__A){>f8xi5M-uGYzs8qZ=Le
z^3FFdEaREFKV8f0D&*&M?=lSGY1y^x1m_Qrhsxx9CW|bBa@itbI$hHi#_UC4mvkqh
z?*1fWxe;(ewsg5%+!_r>6>g>vj|V$Z`0~d&dn6I=VW*NnbBAZ%p9C^yFo1!5mCLim
z04c027iNja4M3pZgooM{0h`>Lw#mf7r(hLftBN2}!Jl#hayOj^+O9AP#RA}4U^rV;
z3~9lEILN^Z5+JZ$#h_vKVz@u#tnF%_Q9KoLAXeD-c981?Up0>A+2dtIh^J-aV|z>B
z(ad?ciZA5Y3^l?uVVTe<GzksDDxpfK6l_8>T55z^Y^@YpgbHC9D=dYnU}hUjVOHpE
zhbKf;qN95JGYeM1BGjQ9E4nq)y)9AfpCzy;ph@!lkWh`j1@>Ag%oYbr!9b+v$Kg1z
zD?CZxr2-Al?&voztbM*Q?Zx{heX%X|xyYS2WH*Y;zzizrVO(<kdqF`n?DJ^C!DME&
zzyfAp0E6t{0tls!bSoRQz;Q(ZzI|%w3C&DJCcaAPSZNj9JttSl5DJ8RAxF^RuNGe{
z@}zbqwzT+X!iT#WUkUhFF19rImy0lRXSkC88HG&lY%=@43Jmm|HqP(J;*r-vmB8-q
z!ay3@!I$Z~U<<Qv#LH*3@Ng7-$~0Z@^OE-V^?4aN8oegRs5a@1*=pU?{5-WjKQAAD
z^ro!r?Ci{(T<wN-ZB>rGT5qXPXIE-+)H+MHR&CbmtJOJKTAfC#F;`f!vcF{)24Hvb
z9sA6xnrhaYD>Kx(>P($lmzAMa>$A|Ot};WXuP|q7vobTp#4gy0GHZfatbQ{DLeaH0
zE8GIch<{*axeI^8v|z`?_OHj&d2cmL6Rlg}y`cU)AZ$$wOlQRm{6u>oc}3P+1gVp)
zn1d@ZWtuPxN6HkmNTL|+^UTFUp-nv^5y8A_3s3ei7G47BH%WxfN6}Xn!`2w9l=Uek
zn4_(@g$+}%Stt_b0wX10kl_~(%ET>~_=(T`1bN(JMrWR}Td&)s4h3=jc(ZhkJPfV~
zE9#*Ezlka_plI4SDH>nYUcig||CKr!!f9h}I2YXxgK*RK*N4Z&$b;w7=YdsX-&3eu
zqV^Gq(&tnCs9$>7|CHqH1<-Z45(a?{F2Eb@b*e*w=};mWD3(kVQwB<?KoSm@l@9w{
zdTRXMD!_3)wzBXy18sUC8->NCsmFEs*8~<aQ~Ge`AFccocfBx`&eq&Z_i3WJ{zCCg
z1$soAMpf%V{X$AcbQmv)SL$J>oSoePr&!G@*uzTKg1?yA3?F&Hdy;6Rv}E>Pn8bF}
z!y0&(?Z+Gw_q0K(oK0N~?~8ACz!D+}dQ`hh?^tJdqFp?B{w^k!S_8v?>)<Z&&pY5v
z2oXnKN~Ey|a8i_begOP|xwgX`_UcOz!@hHZFFfdBcx(W)>})Hfh~`l88Su}0k7D|q
zU-TF3*h?^OY*Fl3D~93n``{gk1NQp{(6e{L$k%eMMyq2Xe}^dc_5p}sxvel=Yz-&B
zQ^1=eQ?FPdi>-SCKJ%Db|0F~p?flLp(aw<eR94pwLDGJH3#*!1tD5Fos~gzAx5GW&
zqkR_dfE6Pl^oV7Tz&wyRVc+z?KjAOjol|_^XRs0AW8T@rf_fl~4YuF`E}{@A`HnEw
z)mB+;wdmW}RAsg`G)<{&UMdX*-#En1{teRE-~bX*)q@vT@h#rJKCwZLcru2_2&>o)
zb0V+BI>l7gTw7zU;vSiKHxw#8$3*)nSOP4u6Q*$=LE`3E(jIj9dzelbT!56`)3Dux
zqNh*8F#E9w@38xJgRgR~t*XA*yn4j<g&vqKnY~BN?9gRUOM!|T&*3RCb1TNYv=cJK
zZBs~{4{d%XpRGtGUhoz(8%a0&MH;D~4|e&`f&F>Z)Z8Hs%85bN7k~2?m!q|St;i?O
z_g@9Mtj4;W1@DAito|D~FL4$+zooWvwXwlkU0c)ARE1Z5pJewMu`}0Sq4GvK>7*I{
zWlaq=P3C%BGG8*VSzDkug#R1EUHF%3lGyPibb*N6ACR$$7d@UJatQdwJr(O8MW6F<
zRK~vE1ShXOk8XN4h460~cL~J?5s#}$wlCdgnL&41bhpKjS6DwG1V4D;Djbo+Z^r2K
zqj9BiqG}fT5_*-Wt}}e(RXVFA@>axKsAfX~-kAK^>|An)X>!OZW-yU;qCJn46L^9q
z?%BZKo0+nJ#IiFcGVrLJJS-k8AjyPowamIjkSYCsM9zj}Bu<P=CFcN-SK39~Y#?Pm
Kw_LO@GXB5!p^k$9

diff --git a/NovetusLauncher/NovetusCMD/Program.cs b/NovetusLauncher/NovetusCMD/Program.cs
index 5727d64..6c92f24 100644
--- a/NovetusLauncher/NovetusCMD/Program.cs
+++ b/NovetusLauncher/NovetusCMD/Program.cs
@@ -218,18 +218,18 @@ namespace NovetusCMD
                 if (CommandLine["no3d"] != null)
 				{
 					StartInNo3D = true;
-                    ConsolePrint("NovetusCMD will now launch the server in No3D mode.\n", 4);
+                    ConsolePrint("NovetusCMD will now launch the server in No3D mode.", 4);
                 }
 
                 if (CommandLine["overrideconfig"] != null)
                 {
                     OverrideINI = true;
-                    ConsolePrint("NovetusCMD will no longer grab values from the INI file.\n", 4);
+                    ConsolePrint("NovetusCMD will no longer grab values from the INI file.", 4);
 
                     if (CommandLine["upnp"] != null)
                     {
                         GlobalVars.UPnP = true;
-                        ConsolePrint("NovetusCMD will now use UPnP for port forwarding.\n", 4);
+                        ConsolePrint("NovetusCMD will now use UPnP for port forwarding.", 4);
                     }
 
                     if (CommandLine["map"] != null)
@@ -261,12 +261,12 @@ namespace NovetusCMD
     		GlobalVars.SelectedClient = GlobalVars.DefaultClient;
     		GlobalVars.Map = GlobalVars.DefaultMap;
     		Console.Title = "Novetus " + version + " CMD";
-    		GlobalVars.Version = version;
+            ConsolePrint("NovetusCMD version " + version + " loaded. Initializing config.", 1);
+            GlobalVars.Version = version;
 
             if (!OverrideINI)
             {
                 ConsolePrint("NovetusCMD is now loading all server configurations from the INI file.", 5);
-                ConsolePrint("NovetusCMD version " + version + " loaded. Initializing config.", 4);
 
                 if (!File.Exists(GlobalVars.ConfigDir + "\\config.ini"))
                 {
@@ -276,13 +276,18 @@ namespace NovetusCMD
 
                 ReadConfigValues();
             }
+            else
+            {
+                ReadClientValues(GlobalVars.SelectedClient);
+            }
 
     		InitUPnP();
     		StartWebServer();
     		
     		AppDomain.CurrentDomain.ProcessExit += new EventHandler(ProgramClose);
-    		
-			StartServer(StartInNo3D);
+
+            ConsolePrint("Launching a " + GlobalVars.SelectedClient + " server on " + GlobalVars.Map + " with " + GlobalVars.PlayerLimit + " players.", 1);
+            StartServer(StartInNo3D);
 			Console.ReadKey();
 		}