unknownworlds/ns
0
0
Fork 0
mirror of https://github.com/unknownworlds/NS.git synced 2024-11-26 06:20:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

o Cleanup of AVH_PLAYTEST_BUILD

Browse source 
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
This commit is contained in:
puzl 2005-08-03 21:15:53 +00:00
parent 88b8f055de
commit 70b6fb68fe
9 changed files with 12 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releases/3.1/liblist.gam
View file

@ -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"

BIN
releases/3.1/source/Natural_Selection.suo
View file

Binary file not shown.

2
releases/3.1/source/cl_dll/cl_dll.vcproj
View file

@ -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"

4
releases/3.1/source/dlls/hl.vcproj
View file

@ -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"

2
releases/3.1/source/mod/AvHConsoleCommands.cpp
View file

@ -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
}

2
releases/3.1/source/mod/AvHGamerules.cpp
View file

@ -3622,7 +3622,7 @@ bool AvHGamerules::GetIsCheatEnabled(const string& inCheatName) const
bool theAllowCheats = this->GetCheatsEnabled();
#ifdef AVH_PLAYTEST_BUILD
#ifdef DEBUG
theAllowCheats = true;
#endif

3
releases/3.1/source/mod/AvHNexusClient.cpp
View file

@ -1,7 +1,4 @@
#ifdef AVH_PLAYTEST_BUILD
#define AVH_NO_NEXUS
#endif
#ifdef AVH_NO_NEXUS
#include <string>
using std::string;

7
releases/3.1/source/mod/AvHNexusServer.cpp
View file

@ -1,15 +1,12 @@
#ifdef AVH_PLAYTEST_BUILD
#define AVH_NO_NEXUS
#endif
#ifdef AVH_NO_NEXUS
#include <string>
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) {}

30
releases/3.1/source/mod/AvHTeam.cpp
View file

@ -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