Mercurial > mm7
diff LOD.cpp @ 737:225d92620998
004A19D8 refactored
author | Nomad |
---|---|
date | Fri, 22 Mar 2013 20:40:23 +0200 |
parents | 700b58aac975 |
children | cf2fbac6edc9 |
line wrap: on
line diff
--- a/LOD.cpp Fri Mar 22 20:07:55 2013 +0200 +++ b/LOD.cpp Fri Mar 22 20:40:23 2013 +0200 @@ -2160,19 +2160,19 @@ int LODFile_Sprites::_461397() { int result; // eax@1 - int *pfield_ECA0; // edi@1 + //int *pfield_ECA0; // edi@1 int v3; // esi@1 int v4; // ecx@3 result = this->uNumLoadedSprites; - pfield_ECA0 = &this->field_ECA0; + //pfield_ECA0 = &this->field_ECA0; v3 = this->field_ECA0; this->field_ECA8 = result; if ( result < v3 ) this->field_ECA8 = v3; v4 = this->field_ECA4; if ( v3 < v4 ) - *pfield_ECA0 = v4; + field_ECA0 = v4; return result; } @@ -3051,12 +3051,9 @@ Texture *LODFile_IconsBitmaps::LoadTexturePtr(const char *pContainer, enum TEXTURE_TYPE uTextureType) { uint id = LoadTexture(pContainer, uTextureType); - if (id == -1) - { - assert(false); - Log::Warning(L"LOD error\\no container: \"%S\"", pContainer); - return nullptr; - } + + assert(id != -1 && L"Texture not found"); + return &pTextures[id]; }