1
0
mirror of https://github.com/blawar/GLideN64.git synced 2024-06-30 08:24:05 +00:00

Fix Vs2015 compile issues (#2665)

* fix vs2015 compile issue
This commit is contained in:
zilmar 2022-03-04 22:05:29 +10:30 committed by GitHub
parent 1a711257ed
commit 37c09949b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,7 +10,7 @@ TxHiResNoCache::TxHiResNoCache(int maxwidth,
int options, int options,
const wchar_t *cachePath, const wchar_t *cachePath,
const wchar_t *texPackPath, const wchar_t *texPackPath,
const wchar_t *fullTexPath, const wchar_t *fullTexPath,
const wchar_t *ident, const wchar_t *ident,
dispInfoFuncExt callback) dispInfoFuncExt callback)
: TxHiResLoader(maxwidth, maxheight, maxbpp, options) : TxHiResLoader(maxwidth, maxheight, maxbpp, options)
@ -86,10 +86,13 @@ bool TxHiResNoCache::get(Checksum checksum, N64FormatSize n64FmtSz, GHQTexInfo *
} }
return _loadedTex.end(); return _loadedTex.end();
}; };
if (auto loadedTexMap = findTex(checksum); loadedTexMap != _loadedTex.end()) { {
DBG_INFO(80, wst("TxNoCache::get: cached chksum:%08X %08X found\n"), chksum, palchksum); auto loadedTexMap = findTex(checksum);
*info = loadedTexMap->second; if (loadedTexMap != _loadedTex.end()) {
return true; DBG_INFO(80, wst("TxNoCache::get: cached chksum:%08X %08X found\n"), chksum, palchksum);
*info = loadedTexMap->second;
return true;
}
} }
DBG_INFO(80, wst("TxNoCache::get: loading chksum:%08X %08X\n"), chksum, palchksum); DBG_INFO(80, wst("TxNoCache::get: loading chksum:%08X %08X\n"), chksum, palchksum);