Jeck - Cleanup some debug messages, cache now clears unlocked items between states.

This commit is contained in:
wagic.jeck
2009-09-20 00:05:23 +00:00
parent 1ba7f108b0
commit 1689edc69b
3 changed files with 2 additions and 19 deletions

View File

@@ -57,9 +57,6 @@ public:
string resname; string resname;
JQuad * quad; JQuad * quad;
#ifdef DEBUG_CACHE
static int totalTracked;
#endif
}; };
class WCachedTexture: public WCachedResource{ class WCachedTexture: public WCachedResource{

View File

@@ -477,10 +477,6 @@ void WTrackedQuad::Trash(){
SAFE_DELETE(quad); SAFE_DELETE(quad);
} }
#if defined DEBUG_CACHE
int WTrackedQuad::totalTracked = 0;
#endif
unsigned long WTrackedQuad::size() { unsigned long WTrackedQuad::size() {
return sizeof(JQuad); return sizeof(JQuad);
} }
@@ -488,18 +484,8 @@ bool WTrackedQuad::isGood(){
return (quad != NULL); return (quad != NULL);
} }
WTrackedQuad::WTrackedQuad(string _resname) { WTrackedQuad::WTrackedQuad(string _resname) {
#if defined DEBUG_CACHE
OutputDebugString("WTrackedQuad().\n");
totalTracked++;
#endif
quad = NULL; resname = _resname; quad = NULL; resname = _resname;
} }
WTrackedQuad::~WTrackedQuad() { WTrackedQuad::~WTrackedQuad() {
#if defined DEBUG_CACHE
char buf[512];
totalTracked--;
sprintf(buf,"~WTrackedQuad() {%d}. %d left.\n", (int) quad,totalTracked);
OutputDebugString(buf);
#endif
if(quad) SAFE_DELETE(quad); if(quad) SAFE_DELETE(quad);
} }

View File

@@ -818,13 +818,13 @@ void WResourceManager::CacheForState(int state){
case GAME_STATE_DUEL: case GAME_STATE_DUEL:
textureWCache.Resize(SMALL_CACHE_LIMIT,SMALL_CACHE_ITEMS); textureWCache.Resize(SMALL_CACHE_LIMIT,SMALL_CACHE_ITEMS);
sampleWCache.Resize(SMALL_CACHE_LIMIT,MAX_CACHED_SAMPLES); sampleWCache.Resize(SMALL_CACHE_LIMIT,MAX_CACHED_SAMPLES);
Cleanup(); ClearUnlocked();
break; break;
//Deck editor and shop are entirely cache safe, so give it near infinite resources. //Deck editor and shop are entirely cache safe, so give it near infinite resources.
case GAME_STATE_SHOP: case GAME_STATE_SHOP:
case GAME_STATE_DECK_VIEWER: case GAME_STATE_DECK_VIEWER:
textureWCache.Resize(HUGE_CACHE_LIMIT,HUGE_CACHE_ITEMS); textureWCache.Resize(HUGE_CACHE_LIMIT,HUGE_CACHE_ITEMS);
Cleanup(); ClearUnlocked();
break; break;
//Anything unknown, use large cache. //Anything unknown, use large cache.
default: default: