unknownworlds
/
ns
mirror of https://github.com/unknownworlds/NS.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Only ssay81.wav now plays when invoking "weld me" 

o Fixed bug in the inconsistency ignore

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@354 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
tankefugl 2005-11-18 15:44:26 +00:00
parent f4a13c405b
commit 50114acc4e
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
releases/3.1.1/source/dlls/client.cpp
View File

@ -2250,6 +2250,7 @@ int InconsistentFile( const edict_t *player, const char *filename, char *disconn
while ( ignoreInConsistencyCheck[i] != 0 ) { while ( ignoreInConsistencyCheck[i] != 0 ) {
if ( !strcmp(ignoreInConsistencyCheck[i], filename) ) if ( !strcmp(ignoreInConsistencyCheck[i], filename) )
return 0; return 0;
i++;
} }
// Default behavior is to kick the player // Default behavior is to kick the player
sprintf( disconnect_message, "Server is enforcing file consistency for %s\n", filename ); sprintf( disconnect_message, "Server is enforcing file consistency for %s\n", filename );

29
releases/3.1.1/source/util/STLUtil.cpp
View File

@ -229,6 +229,12 @@ string BuildAbridgedString(const string& inString, int inMaxLen)
return theAbridgedString; return theAbridgedString;
} }
static char *ignoreSounds[] = {
"vox/ssay82.wav",
"vox/ssay83.wav",
0
};
// Pass in relative path, do search on path including mod directory, return files relative to mod directory // Pass in relative path, do search on path including mod directory, return files relative to mod directory
bool BuildFileList(const string& inBaseDirectoryName, const string& inDirectoryName, const string& inFileExtension, CStringList& outList) bool BuildFileList(const string& inBaseDirectoryName, const string& inDirectoryName, const string& inFileExtension, CStringList& outList)
{ {
@ -288,8 +294,27 @@ bool BuildFileList(const string& inBaseDirectoryName, const string& inDirectoryN
std::replace(theFullFileName.begin(), theFullFileName.end(), '\\', '/'); std::replace(theFullFileName.begin(), theFullFileName.end(), '\\', '/');
theCString = theFullFileName; theCString = theFullFileName;
outList.push_back(theCString); #ifdef AVH_SERVER
theSuccess = true; // <HACK> Ignore ssay82 and ssay83 till we can client patch this ..
int i=0;
bool found = false;
while ( ignoreSounds[i] != 0 ) {
if ( !strcmp(ignoreSounds[i], theCString))
{
found = true;
}
i++;
}
if (found == false)
{
#endif
outList.push_back(theCString);
theSuccess = true;
#ifdef AVH_SERVER
}
// </HACK>
#endif
#ifdef WIN32 #ifdef WIN32
} }
while(FindNextFile(theFileHandle, &theFindData)); while(FindNextFile(theFileHandle, &theFindData));