From 33a232a840cb5c3e22e6db3a8b905999f73dd122 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Sun, 3 May 2020 15:58:51 +0200 Subject: [PATCH] Prevent vanilla .resource maps to be reloaded. Pull request #477 --- neo/framework/FileSystem.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neo/framework/FileSystem.cpp b/neo/framework/FileSystem.cpp index 55c861bc..dbfd9cc9 100644 --- a/neo/framework/FileSystem.cpp +++ b/neo/framework/FileSystem.cpp @@ -2884,13 +2884,19 @@ idFileSystemLocal::FindResourceFile */ int idFileSystemLocal::FindResourceFile( const char* resourceFileName ) { + // MadDeCoDeR: prevent vanilla .resource maps to be reloaded #447 + const char* mapFileName = va( "maps/%s", resourceFileName ); + for( int i = 0; i < resourceFiles.Num(); i++ ) { - if( idStr::Icmp( resourceFileName, resourceFiles[ i ]->GetFileName() ) == 0 ) + if( idStr::Icmp( resourceFileName, resourceFiles[ i ]->GetFileName() ) == 0 || + idStr::Icmp( mapFileName, resourceFiles[i]->GetFileName() ) == 0 ) { return i; } } + // MadDeCoDeR:end + return -1; } /*