From c5091bef79c7f5dc4fe2f5f0215cf12110f0356e Mon Sep 17 00:00:00 2001 From: efinst0rm Date: Sat, 15 Apr 2023 12:39:41 -0500 Subject: [PATCH] Use current production _serversettings.gsc --- data/scripts/mp/gametypes/_serversettings.gsc | Bin 4518 -> 4612 bytes .../mp/gametypes/_serversettings.gsc_raw | 25 +++++++----------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/data/scripts/mp/gametypes/_serversettings.gsc b/data/scripts/mp/gametypes/_serversettings.gsc index 0105b093db16db0bee7ce860fc6f1d226bf54fea..bf3985aab646d5b010b7fea76bcc9567366f1d51 100644 GIT binary patch literal 4612 zcmZ8k3viUx6+ZuNs4>dAg0x#@HlLZowu%)W9ivha5laEJj!GG&&~p-hvScSW|M|{2_dDm_ z|DJpA-&e9~;mjPE``|6z`vw_+fE3`#pPpH>04i?=xP*;lYA@vgG@<>MkPS|l{E0yX z$zXd^B9*iRwKgP@P2FK|JHcTGn;UW=S{KEf zCVGTgA%!iNia=~FBty^~PsOf{vNd55Jd>8XDUg4o~X++x^Y4~P2>AgxRTd}C#MKb-Uf6!|v z+k5XlhY7!;g;h$=n#D&{cN`@=?3JCCnQ(OFyo~xD{mlhZX!VVuypiMFWP8UiVb#2;m*m}fwLaofyTKXC(y3Jjqh9BMl|ml9-p&oTp8Ke+D)#{w zJ%m6V4|n`4whKtVEZPE?Ss6~{7W=~+SYX;X=VxE48~E7Gmug*bB@681j6G@pFV z$z6sIC*vgqdz&5e(8p}2NN)tYkVmVz%dz>t6*(9DGC4hGYg#lEdz;}oRtjnNmnbjy zYwO6ySt&-yL$cfw^b?m_2`yy{RvUykx%m=yT&1lipP0j^_!@mQ9Bi1f@6IF68edU7 zbmsNbzxGPl5xq`FvfN@%Tt=Hj4FSRb9Rt0`Du)zn7RMZY>XBy#(FNa8Wa;wXoZQxv zCt)A9Cc-2$uIgqv`Wd}o68cj<8bfcf4fU97nK14neqAGt^BjAW)q;fGl**w5mqS5(_I2jK%3!FDskkkv8qojtK|H6@el*8Ui@ZGil>)C{5$cOXh zz5T7RPYAc!gSj)7^g5PUzPKu7^X8L|emlHbsaer)zkrn%!(%1RAy`_OULcp;0j=we z^ZvA03wKlfS&ON5PirA2+l58b^ClyTm}X*sh)$@Ad*wL!Yr(MRmAGE>gdyf6{4$t3FZb3JHb-wRLx&MZzW=%bKW;a1W~z>gWd!Qkz_lYN>vPmC$*o ziFk+IP_V;HxlN}%vr={?Zs{0q;xiaL@y$0l$dvttDNp*XJbOHO}FD;vHupG|LBh0&klA z%u>UAB^PTx%&$UTt!}$60B zTA(82$aeOuARV0>#JgVou9bM-&WEnKYKREDKX+}mkI?$>E_5~^Z;#%u2tX$fnrit~ zJ73z-^3aSurV+OcJSNDmcaG${45a&%OT>tGi>pdWy!b|JH7wW#Ua#^oS2^)^9ngi4 z_a&d%UIcgh!SQd)t+_24drQ~8C$vqx4Bj(>c1#^N*M&$ortt(P^BvU_?-&dIXK_6X zy!TliGc#r1x;@r6{wHM@ti}{3e!q8Q8E9_-ZM|<|{V6sSO{~ATPB*ds@EpXwEg`Hw zwN(^&S$l@hkuz1Cb)TDY^z)+V?RlNbIhq%lVK)<*qZBRu#Bm@W5>#UzlQ=x!gX*2> z=9?(s{p#%IbF5!c3J+Mp^rodCzqfexHy@7`+pjoe@DLAWC)D#)x<=9k6#TU@$#6`) zHVEyqL68m_VO+N>-m^Lx3HyLm+=Y9(Mu>CXB(-caJn1Zjejd6Lz6GwX_~4^o9f}$L z<(1(+0F8dfMx&>gbit})+~ejmB3ZYOPoO)>GmsKb(3+v#P=s*_qoA{ zzggDy#SM4FRb#mgS?N(?O;&jR9^U;Z#z$2=|q+&SZs(=10q84j!$dy462e{Q- zwEN7Y^ZR?&QJg*MZUx1`-6{Gy2Y5OyGYE0=?3eva!2$hy*1RiHwx)JsG2p+MY_-pZ zC(v-=+HTU#P~?|=ZC`!M3sxx`(VKizejm$kQG1u1t{z&u#v)}u7`iy{46fIP-@a

GK^<{6v7qA5j?2qK@va6FTgC_}%_;8QSPxD(LKcH}%8M0O;%zbdT>J-n8`w06GUr zhcxh?`i&sP?-4o!1>J+Ke_X`k_X?eZLSHABcshVO8iSw{azGyWe*8!G=6>JP2N}o` z{S~p057{r^Ke{JtPrdvR1B~brVmenQV=@XA=1=?iBo-+W)9?`DO#hK-_Dj?7T=Dh( zPQ;n~eHj?Py%f6;AHn%b;rwL!y^nf2r-VE&Wb|XO-)&jf$1x(#>|cqP?kPh5u4(pN z)9i;b>>}j9fOszEl*y4j~KpVkhFM_s=NC5DV`fUz73} zVqqO2R-8bb$!ElQ%N%nH;!OMIY4`-<%sF-9_-HSjoFh<-BBq-939Fph*W)eI@aNMo zf8+K3L(}jD#F_D&xc+HR5Z+M=u@E1ZmFf`Ut+>->`kct{!8uWBr`e09;St0FC;4AO zEYuQWxdLlzC)Oj%a0LI+T@jZWv|s{SoG%ui^sRtX564g*$5xIGJg$!-lV$1-c&+*LNuQq3#)c(w&cd4k4DI@zhT~y(o{P&Wcak?=USGMOlS&+>7mf zY(|{F&Dc(0+mG`g!?E;XJBzIzed*pu+%kNRI}y|O6y~xnPc?9ME1C<-B A;Q#;t literal 4518 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 lT8-xPn`hC??am2-b5co`v1o6m&5=7 diff --git a/data/scripts/mp/gametypes/_serversettings.gsc_raw b/data/scripts/mp/gametypes/_serversettings.gsc_raw index 580e2966..e420ca3c 100644 --- a/data/scripts/mp/gametypes/_serversettings.gsc_raw +++ b/data/scripts/mp/gametypes/_serversettings.gsc_raw @@ -3,11 +3,9 @@ #using scripts\shared\callbacks_shared; #using scripts\shared\system_shared; -#insert scripts\shared\shared.gsh; - #namespace serversettings; -REGISTER_SYSTEM( "serversettings", &__init__, undefined ) +function autoexec __init__sytem__() { system::register("serversettings",&__init__,undefined,undefined); } function __init__() { @@ -17,36 +15,33 @@ function __init__() function init() { level.hostname = GetDvarString( "sv_hostname"); - if (level.hostname == "") - { + if(level.hostname == "") level.hostname = "CoDHost"; - } - SetDvar("sv_hostname", level.hostname); SetDvar("ui_hostname", level.hostname); + //makeDvarServerInfo("ui_hostname", "CoDHost"); level.motd = GetDvarString( "scr_motd" ); if(level.motd == "") - { level.motd = ""; - } SetDvar("scr_motd", level.motd); SetDvar("ui_motd", level.motd); + //makeDvarServerInfo("ui_motd", ""); level.allowvote = GetDvarString( "g_allowvote" ); if(level.allowvote == "") - { level.allowvote = "1"; - } SetDvar("g_allowvote", level.allowvote); SetDvar("ui_allowvote", level.allowvote); - + //makeDvarServerInfo("ui_allowvote", "1"); + level.allow_teamchange = "1"; SetDvar("ui_allow_teamchange", level.allow_teamchange); level.friendlyfire = GetGametypeSetting( "friendlyfiretype" ); SetDvar("ui_friendlyfire", level.friendlyfire); + //makeDvarServerInfo("ui_friendlyfire", "0"); if(GetDvarString( "scr_mapsize") == "") SetDvar("scr_mapsize", "64"); @@ -62,7 +57,7 @@ function init() constrain_gametype(GetDvarString( "g_gametype")); constrain_map_size(level.mapsize); - + thread setup_callbacks(); for(;;) @@ -88,7 +83,7 @@ function update() SetDvar("ui_motd", level.motd); } - g_allowvote = GetDvarString( "g_allowvote"); + g_allowvote = GetDvarString( "g_allowvote" ); if(level.allowvote != g_allowvote) { level.allowvote = g_allowvote; @@ -211,4 +206,4 @@ function setup_callbacks() function default_onForfeit() { level.gameForfeited = false; -} +} \ No newline at end of file