[iortcw] 04/497: MP: Only touch legacy dll for pure check

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 62fadc477a4e58616302034a75edca20aa053b23
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Tue Jan 14 23:49:36 2014 +0000

    MP: Only touch legacy dll for pure check
---
 MP/code/server/sv_client.c | 7 ++++---
 MP/code/server/sv_init.c   | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/MP/code/server/sv_client.c b/MP/code/server/sv_client.c
index c88fd19..259b92a 100644
--- a/MP/code/server/sv_client.c
+++ b/MP/code/server/sv_client.c
@@ -1273,9 +1273,10 @@ static void SV_VerifyPaks_f( client_t *cl ) {
 
 		nChkSum1 = nChkSum2 = 0;
 
-		bGood = ( FS_FileIsInPAK( Sys_GetDLLName( "cgame" ), &nChkSum1 ) == 1) ;
+		// Only check the legacy dll for legacy clients
+		bGood = ( FS_FileIsInPAK( "cgame_mp_x86.dll", &nChkSum1 ) == 1) ;
 		if ( bGood ) {
-			bGood = ( FS_FileIsInPAK( Sys_GetDLLName( "ui" ), &nChkSum2 ) == 1) ;
+			bGood = ( FS_FileIsInPAK( "ui_mp_x86.dll", &nChkSum2 ) == 1) ;
 		}
 
 		bQvmGood = ( FS_FileIsInPAK( "vm/cgame.mp.qvm", &nChkSumQvm1 ) == 1) ;
@@ -1320,7 +1321,7 @@ static void SV_VerifyPaks_f( client_t *cl ) {
 			}
 			// verify the second to be the ui checksum
 			pArg = Cmd_Argv( nCurArg++ );
-			if ( !pArg || *pArg == '@' || ( atoi( pArg ) != nChkSum1 && ( !bQvmGood || atoi( pArg ) != nChkSumQvm2 ) ) ) {
+			if ( !pArg || *pArg == '@' || ( atoi( pArg ) != nChkSum2 && ( !bQvmGood || atoi( pArg ) != nChkSumQvm2 ) ) ) {
 				bGood = qfalse;
 				break;
 			}
diff --git a/MP/code/server/sv_init.c b/MP/code/server/sv_init.c
index c41ef77..9264ed3 100644
--- a/MP/code/server/sv_init.c
+++ b/MP/code/server/sv_init.c
@@ -473,7 +473,7 @@ static void SV_TouchCGame( void ) {
 	fileHandle_t f;
 	char filename[MAX_QPATH];
 
-	Com_sprintf( filename, sizeof( filename ), "vm/%s.qvm", "cgame" );
+	Com_sprintf( filename, sizeof( filename ), "vm/%s.mp.qvm", "cgame" );
 	FS_FOpenFileRead( filename, &f, qfalse );
 	if ( f ) {
 		FS_FCloseFile( f );
@@ -491,7 +491,8 @@ void SV_TouchCGameDLL( void ) {
 	fileHandle_t f;
 	char *filename;
 
-	filename = Sys_GetDLLName( "cgame" );
+	// Only touch the legacy dll since we have qvm support
+	filename = "cgame_mp_x86.dll";
 	FS_FOpenFileRead_Filtered( filename, &f, qfalse, FS_EXCLUDE_DIR );
 	if ( f ) {
 		FS_FCloseFile( f );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git