phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

don't cache handles that don't have a key (i.e. couldn't be found when reloading)

Browse Source 
This was SVN commit r991.
This commit is contained in:
janwas 2004-08-14 12:36:03 +00:00
parent 3ba9855b2e
commit 5edadf1433
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/lib/res/h_mgr.cpp
View File

@ -424,8 +424,6 @@ Handle h_alloc(H_Type type, const char* fn, uint flags, ...)
i32 idx;
HDATA* hd;
const uint scope = flags & RES_SCOPE_MASK;
// get key (either hash of filename, or fn param)
uintptr_t key = 0;
// not backed by file; fn is the key
@ -440,6 +438,12 @@ Handle h_alloc(H_Type type, const char* fn, uint flags, ...)
key = fnv_hash(fn);
}
// disable caching if no key, because it would never be found
if(!key)
flags |= RES_NO_CACHE; // changes scope to RES_TEMP
const uint scope = flags & RES_SCOPE_MASK;
if(key)
{
// object already loaded?