From 70b6fb68fedb4837e16cbc8b6f9d4b2eed4fbc25 Mon Sep 17 00:00:00 2001 From: puzl Date: Wed, 3 Aug 2005 21:15:53 +0000 Subject: [PATCH] o Cleanup of AVH_PLAYTEST_BUILD o Force define of AVH_NO_NEXUS o Tidy up of some USE_OLDAUTH issues o Changed urls in liblist.gam git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@321 67975925-1194-0748-b3d5-c16f83f1a3a1 --- releases/3.1/liblist.gam | 4 +-- releases/3.1/source/Natural_Selection.suo | Bin 57344 -> 57344 bytes releases/3.1/source/cl_dll/cl_dll.vcproj | 2 +- releases/3.1/source/dlls/hl.vcproj | 4 +-- .../3.1/source/mod/AvHConsoleCommands.cpp | 2 +- releases/3.1/source/mod/AvHGamerules.cpp | 2 +- releases/3.1/source/mod/AvHNexusClient.cpp | 5 +-- releases/3.1/source/mod/AvHNexusServer.cpp | 9 ++--- releases/3.1/source/mod/AvHTeam.cpp | 32 +----------------- 9 files changed, 12 insertions(+), 48 deletions(-) diff --git a/releases/3.1/liblist.gam b/releases/3.1/liblist.gam index fcde82a..1aa8f8e 100644 --- a/releases/3.1/liblist.gam +++ b/releases/3.1/liblist.gam @@ -3,8 +3,8 @@ // by Charlie Cleveland // //////////////////////////// game "Natural Selection 3.1 (PT build 318)" -url_info "www.natural-selection.org" -url_dl "http://www.natural-selection.org/" +url_info "http://www.unknownworlds.com/ns/" +url_dl "http://www.unknownworlds.com/ns/view?action=files" version "v3.0" size "165000000" svonly "0" diff --git a/releases/3.1/source/Natural_Selection.suo b/releases/3.1/source/Natural_Selection.suo index 3dd4cc21649004f35db891f3e87bad7a7f441616..dc45de73d52418da4175ce5808f19cabc90bdf83 100644 GIT binary patch delta 2589 zcmc&$ZA_b06h8Ou2Q3!*1#O4jRw_)KZUa`_wEQTmc7Uan!a`%RA!F0w_!7Fg5jU$b zaX$z;j<}CxppM}WUHEw8OiX52jM15>!NmPCu>Dczey}CP58PJIeOvmGl1~53OP=@M zbNZa~p7)+}?;$)R3(v?V2ZX%4kw~N%0M-%sx{zj^lv&i9Xi-Wi!%Iq|W(%zXgd)Q6 z2ESM;t7N&h(H{=Kbn;6kBc;nF_RDLThFnApB=Z?(GWHH3BhUL;yHXFypMwsOAy62o5ey>qAVrk)#C^_8X2076F$G zm+=dEnYd{DUgpfEpLRe9+M$D1HM#U?guT!U2c;*#H5I8k-~hDJd`n4>eG+xbgh$3# zu^V{DY+Rg7}T4U#n3NK~IS9Q>etEw*5ky8-$+; zJafO&e4X%HOvaDP9xGWQ;ZMR}G3DPh-zMDQG9kieGM+AX>D1RX0KXG}?=stht81DS z6(kmM8NC6=w0lOt*L4M0ec84^&q?p^)-S+rWnz#$+c2iEm2qk2wd4KbTMT0BQ^82_P`M z^z^%^JsYydP0Z;gIC{1aZ7)|j%b^^OkY!o7lGwv=vmqy)S!vm2!pu-+$C4EGhwHC`QVTOW_*;ml6tk`o!3;z+=bJxA*krX`t8 zK{7QaS6J+H;NbS1cmHU3glr!GW4;@g09B!z$m9HJ;_w=~m)` z&%kigKEsBTdRUV=T$MNzFtUW>wdr(RXq;ttry3^M@#p+F)6|`)1ltPiXLfut6x^TS z6sB{;uYwvTg&9wXJ)M;(Lpmqe;I6|QPbE&gl8tBH(Ba+_O{sP9P-YKH5IYR}w+-Xl z_1X+29V13dx)Jf*hWm4R_^Udxr_TIHJkOT&JST64sQ7 zhjc^SOt^S(1sBcUQkKZ+%0>GDzP0C=J$hW@UvNJwRa|IvB}MuFR%dE`->W()k=E(1 zubGN>w&l*FagxwMZJ7_e8SIQze}^sQ3Mopje4O`;W$~`r3RF?PMy&Ff{?nZpJp;+L z_OI{6bklp>iLcSIo^RFRXrEPVKCr%c%~Rl|KWg86GpfN4+o*x>hVE!j=ih=mcd5jS zr`;+H2W{#fiN^b~ig!+VH?4-A&BLoYxq6(|pAwY(7qy*MIyF(d7&D34%rX=GN27_+O-;mvs6$!(o(nA{RZsJ|_dI^*dw#!j zdVj|kQ27F?3o{bUXtbI6jIlzH4T?Z9xDyNpOT>GwwLsm5%3P~cE>~4^!^i}?GC27O zSE19v6oSat8OM0G*t{4znOkS~kuBtMi zr=9h)Q8unT89Nq-u7k|W2ALbRSS=oIc9eDF{hJ1l0j2+PB273_cn7Veq;VHjSku}X zL@Z9oJcZe#c#ojX#R|i0jFquIOcat&3%g!Ojw&64tOxB^gk3#41~G9M0*oys(}X8g zyCg<>nOpwQI%U+E(MSN{FuaA_Pl1h=YM_bTmJkh?N zVqwH03e~h6B!6=W1s?FpzCF#H_=LT5i?{ia@Y*etIo7HOus9lN&PzsA*^zeZ zQORHSmh*yeDBGhgHkBl~tUoUzs+?$J`K>lHr`r9=Md8@9qOCS1aXb`w%|V`%`SSS| z7pKeZ$wgsra;4BFgij%Is+IzE4sz_VQFCMVqSL}Rk0dX8ru^%GBf;WPMc^(_3`#&LC<8k{Ij8`4gI!=JxCh(|?gNU07h7$d z934+2h4;BIVlU>;*<&Y>MV_(&@&HWg$YH?RL6! z?O~doGI5nM^3l7Y5ieyp{A!LpJo{ zC+cJ5cO9ZrQ|7JmDgR+lSqg|A;ZK z641u-d{l0k*7Nvwb_}a~vGNgdP>R?~Z-|}A+A`*Mx#S&3+w!tPx5tvWJ@&B{c-#r! zJM diff --git a/releases/3.1/source/cl_dll/cl_dll.vcproj b/releases/3.1/source/cl_dll/cl_dll.vcproj index 5dd3230..8edd149 100644 --- a/releases/3.1/source/cl_dll/cl_dll.vcproj +++ b/releases/3.1/source/cl_dll/cl_dll.vcproj @@ -113,7 +113,7 @@ EnableIntrinsicFunctions="TRUE" OptimizeForProcessor="0" AdditionalIncludeDirectories=""$(SolutionDir)";U:\inlcude\stlport;U:\include\vgui;U:\include\nexus;U:\include\libpng;U:\include\fmod;U:\include\lua;U:\include\particle;U:\include\zlib" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;AVH_CLIENT;AVH_PLAYTEST_BUILD;$(NOINHERIT);USE_OLDAUTH" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;AVH_CLIENT;USE_OLDAUTH;$(NOINHERIT)" StringPooling="TRUE" RuntimeLibrary="0" RuntimeTypeInfo="TRUE" diff --git a/releases/3.1/source/dlls/hl.vcproj b/releases/3.1/source/dlls/hl.vcproj index 4c9e9ec..bfc1b40 100644 --- a/releases/3.1/source/dlls/hl.vcproj +++ b/releases/3.1/source/dlls/hl.vcproj @@ -27,7 +27,7 @@ InlineFunctionExpansion="2" EnableIntrinsicFunctions="TRUE" AdditionalIncludeDirectories=""$(SolutionDir)";U:\include\stlport;U:\include\nexus;U:\include\lua;U:\include\particle;U:\include" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_PLAYTEST_BUILD;$(NOINHERIT);AVH_SECURE_PRERELEASE_BUILD;USE_OLDAUTH" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_SECURE_PRERELEASE_BUILD;USE_OLDAUTH;$(NOINHERIT)" StringPooling="TRUE" MinimalRebuild="TRUE" RuntimeLibrary="0" @@ -99,7 +99,7 @@ Optimization="0" OptimizeForProcessor="1" AdditionalIncludeDirectories=""$(SolutionDir)";U:\include\stlport;U:\include\nexus;U:\include\lua;U:\include\particle;U:\include" - PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;$(NOINHERIT);AVH_SECURE_PRERELEASE_BUILD;USE_OLDAUTH" + PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_SECURE_PRERELEASE_BUILD;USE_OLDAUTH;$(NOINHERIT)" RuntimeLibrary="1" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="0" diff --git a/releases/3.1/source/mod/AvHConsoleCommands.cpp b/releases/3.1/source/mod/AvHConsoleCommands.cpp index 10fba8c..e50f941 100644 --- a/releases/3.1/source/mod/AvHConsoleCommands.cpp +++ b/releases/3.1/source/mod/AvHConsoleCommands.cpp @@ -271,7 +271,7 @@ BOOL AvHGamerules::ClientCommand( CBasePlayer *pPlayer, const char *pcmd ) theIsPlaytester = theAvHPlayer->GetIsMember(PLAYERAUTH_PLAYTESTER); theIsPlayerHelper = theIsDeveloper || theIsGuide || theIsPlaytester; - #ifdef AVH_PLAYTEST_BUILD + #ifdef DEBUG theIsPlaytest = theIsPlaytester || theIsDeveloper; #endif } diff --git a/releases/3.1/source/mod/AvHGamerules.cpp b/releases/3.1/source/mod/AvHGamerules.cpp index 302fab3..b05cebe 100644 --- a/releases/3.1/source/mod/AvHGamerules.cpp +++ b/releases/3.1/source/mod/AvHGamerules.cpp @@ -3622,7 +3622,7 @@ bool AvHGamerules::GetIsCheatEnabled(const string& inCheatName) const bool theAllowCheats = this->GetCheatsEnabled(); - #ifdef AVH_PLAYTEST_BUILD + #ifdef DEBUG theAllowCheats = true; #endif diff --git a/releases/3.1/source/mod/AvHNexusClient.cpp b/releases/3.1/source/mod/AvHNexusClient.cpp index dc64b9e..60660b8 100644 --- a/releases/3.1/source/mod/AvHNexusClient.cpp +++ b/releases/3.1/source/mod/AvHNexusClient.cpp @@ -1,7 +1,4 @@ -#ifdef AVH_PLAYTEST_BUILD - #define AVH_NO_NEXUS -#endif - +#define AVH_NO_NEXUS #ifdef AVH_NO_NEXUS #include using std::string; diff --git a/releases/3.1/source/mod/AvHNexusServer.cpp b/releases/3.1/source/mod/AvHNexusServer.cpp index dde7460..6a3a772 100644 --- a/releases/3.1/source/mod/AvHNexusServer.cpp +++ b/releases/3.1/source/mod/AvHNexusServer.cpp @@ -1,15 +1,12 @@ -#ifdef AVH_PLAYTEST_BUILD - #define AVH_NO_NEXUS -#endif - +#define AVH_NO_NEXUS #ifdef AVH_NO_NEXUS #include using std::string; #include "AvHNexusServer.h" - + #include "AvHServerUtil.h" bool AvHNexus::send(entvars_t* const pev, const unsigned char* data, const unsigned int length) { return false; } bool AvHNexus::recv(entvars_t* const pev, const char* data, const unsigned int length) { return false; } - string AvHNexus::getNetworkID(const edict_t* edict) { return ""; } + string AvHNexus::getNetworkID(const edict_t* edict) { return AvHSUGetPlayerAuthIDString((edict_t *)edict); } void AvHNexus::handleUnauthorizedJoinTeamAttempt(const edict_t* edict, const unsigned char team_index) {} void AvHNexus::performSpeedTest(void) {} void AvHNexus::processResponses(void) {} diff --git a/releases/3.1/source/mod/AvHTeam.cpp b/releases/3.1/source/mod/AvHTeam.cpp index f7caa2e..7260aca 100644 --- a/releases/3.1/source/mod/AvHTeam.cpp +++ b/releases/3.1/source/mod/AvHTeam.cpp @@ -2480,40 +2480,10 @@ void AvHTeam::UpdateResources() this->mLastResourceUpdateTime = theCurrentTime; } } -// puzl: 1041 -// o Added back in steamid based authids -#ifndef USE_OLDAUTH -#ifdef AVH_PLAYTEST_BUILD -// Function that is backwards-compatible with WON ids -string AvHSUGetPlayerAuthIDString(edict_t* inPlayer) -{ - const char* kSteamIDInvalidID = "-1"; - string thePlayerAuthID; - - // Try to get SteamID - const char* theSteamID = g_engfuncs.pfnGetPlayerAuthId(inPlayer); - if(strcmp(theSteamID, kSteamIDInvalidID)) - { - thePlayerAuthID = theSteamID; - } - // If that fails, get WonID and put it into a string - else - { - int theWonID = g_engfuncs.pfnGetPlayerWONId(inPlayer); - thePlayerAuthID = MakeStringFromInt(theWonID); - } - - return thePlayerAuthID; -} -#endif -#endif + AvHServerPlayerData* AvHTeam::GetServerPlayerData(edict_t* inEdict) { -#ifdef AVH_PLAYTEST_BUILD - string theNetworkID = AvHSUGetPlayerAuthIDString(inEdict); -#else string theNetworkID = AvHNexus::getNetworkID(inEdict); -#endif return &this->mServerPlayerData[theNetworkID]; } // :puzl