* Un-revert compiling fixes
This commit is contained in:
jean.chalard
2009-09-15 16:15:46 +00:00
parent 11ffebf29f
commit 5fe68bc8a2
4 changed files with 11 additions and 4 deletions
+1 -1
View File
@@ -234,7 +234,7 @@ bool WCachedTexture::Attempt(string filename, int submode, int & error){
}
//Failure of a different sort.
if(texture->mTexId == -1){
if(texture->mTexId == INVALID_MTEX){
SAFE_DELETE(texture);
error = CACHE_ERROR_BAD;
return false;
+2 -2
View File
@@ -417,7 +417,7 @@ JTexture* WResourceManager::GetTexture(int id){
for(it = textureWCache.managed.begin();it!= textureWCache.managed.end(); it++){
if(it->second){
jtex = it->second->Actual();
if(jtex->mTexId == id)
if(id == (int) jtex->mTexId)
return jtex;
}
}
@@ -1391,4 +1391,4 @@ bool WCache<cacheItem, cacheActual>::Release(cacheActual* actual){
//Released!
cache.erase(it);
return true;
}
}