Skip to content

Fixes: CRD_PNG_Texture::CleanLocalCachedTextures. #895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenLubar merged 2 commits into from
May 13, 2025
Merged

Fixes: CRD_PNG_Texture::CleanLocalCachedTextures. #895

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa2c768
Fixes: rd_png_texture.cpp
Kitsune44 May 3, 2025
f2a5092
Merge branch 'ReactiveDrop:reactivedrop_beta' into fix01
Kitsune44 May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 10 additions & 19 deletions src/game/client/swarm/rd_png_texture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <vgui/ISurface.h>
#include "vpklib/packedstore.h"
#include "fmtstr.h"
#include "tier2/fileutils.h"

// memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h"
Expand Down Expand Up @@ -90,29 +91,19 @@ void CRD_PNG_Texture::CleanLocalCachedTextures(const char* szDirectory)
if (CommandLine()->FindParm("-override_vpk"))
return;

static char szGameRootPath[MAX_PATH];
static bool bPathInitialized = false;
static char pak01Path[ MAX_PATH ];
static char pak02Path[ MAX_PATH ];
static bool bPathsInitialized = false;

if (!bPathInitialized)
if ( !bPathsInitialized )
{
const char* szGameInfoPath = "gameinfo.txt";
if (g_pFullFileSystem->FileExists(szGameInfoPath, "MOD"))
{
char szFullPath[MAX_PATH];
g_pFullFileSystem->RelativePathToFullPath(szGameInfoPath, "MOD", szFullPath, sizeof(szFullPath));
V_ExtractFilePath(szFullPath, szGameRootPath, sizeof(szGameRootPath));
V_FixSlashes(szGameRootPath);
V_AppendSlash(szGameRootPath, sizeof(szGameRootPath));
bPathInitialized = true;
}
else
{
return;
}
GetModSubdirectory( "pak01", pak01Path, sizeof( pak01Path ) );
GetModSubdirectory( "pak02", pak02Path, sizeof( pak02Path ) );
bPathsInitialized = true;
}

static CPackedStore s_pak01(CFmtStr("%spak01", szGameRootPath), g_pFullFileSystem);
static CPackedStore s_pak02(CFmtStr("%spak02", szGameRootPath), g_pFullFileSystem);
static CPackedStore s_pak01( pak01Path, g_pFullFileSystem );
static CPackedStore s_pak02( pak02Path, g_pFullFileSystem );

struct CleanupRule {
std::initializer_list<const char*> extensions;
Expand Down