From: Simon McVittie Date: Sat, 7 Aug 2010 00:32:59 +0100 Subject: [PATCH] FS_CheckPak0: don't require BASEGAME/pak0.pk3 if fs_basegame is not BASEGAME If fs_basegame is set to another game (like baseoa for OpenArena), *and* we're com_standalone, then we don't necessarily need pak0.pk3 at all. We still clear com_standalone if BASEGAME/pak0.pk3 is found, or if either fs_basegame or fs_game is BASEGAME. Origin: vendor, Debian Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4699 Forwarded: yes --- code/qcommon/files.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/qcommon/files.c b/code/qcommon/files.c index 1bc6b6f..3d2a2a4 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -2963,9 +2963,10 @@ static void FS_CheckPak0( void ) } if( (!Cvar_VariableIntegerValue("com_standalone") || - !fs_gamedirvar->string[0] || !Q_stricmp(fs_gamedirvar->string, BASEGAME) || - !Q_stricmp(fs_gamedirvar->string, "missionpack") ) + ((!fs_gamedirvar->string[0] || + !Q_stricmp(fs_gamedirvar->string, "missionpack")) && + !Q_stricmp(fs_basegame->string, BASEGAME))) && (!founddemo && (foundPak & 0x1ff) != 0x1ff) ) { --