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 3dd4cc2..dc45de7 100644 Binary files a/releases/3.1/source/Natural_Selection.suo and b/releases/3.1/source/Natural_Selection.suo differ 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