Mercurial > mm7

comparison LOD.cpp @ 680:3f504ad074a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 12 Mar 2013 23:26:58 +0600
parents 0e368c04acfb
children 9824e2eeee30
comparison
equal deleted inserted replaced
679:c76775d819d6 680:3f504ad074a8
3092 Texture *LODFile_IconsBitmaps::LoadTexturePtr(const char *pContainer, enum TEXTURE_TYPE uTextureType) 3092 Texture *LODFile_IconsBitmaps::LoadTexturePtr(const char *pContainer, enum TEXTURE_TYPE uTextureType)
3093 { 3093 {
3094 uint id = LoadTexture(pContainer, uTextureType); 3094 uint id = LoadTexture(pContainer, uTextureType);
3095 if (id == -1) 3095 if (id == -1)
3096 { 3096 {
3097 assert(false);
3097 Log::Warning(L"LOD error\\no container: \"%S\"", pContainer); 3098 Log::Warning(L"LOD error\\no container: \"%S\"", pContainer);
3098 return nullptr; 3099 return nullptr;
3099 } 3100 }
3100 return &pTextures[id]; 3101 return &pTextures[id];
3101 } 3102 }
3118 return i; 3119 return i;
3119 3120
3120 // if (!uNumLoadedFiles) 3121 // if (!uNumLoadedFiles)
3121 // { 3122 // {
3122 //LABEL_5: 3123 //LABEL_5:
3123 if (uNumLoadedFiles >= 1000) 3124 assert(uNumLoadedFiles < 1000);
3125 /*if (uNumLoadedFiles >= 1000)
3124 { 3126 {
3125 Log::Warning(L"Maximum texture number exceeded"); 3127 Log::Warning(L"Maximum texture number exceeded");
3126 AbortWithError(); 3128 AbortWithError();
3127 } 3129 }*/
3128 if (LoadTextureFromLOD(&pTextures[uNumLoadedFiles], pContainer, uTextureType) == -1) 3130 if (LoadTextureFromLOD(&pTextures[uNumLoadedFiles], pContainer, uTextureType) == -1)
3129 { 3131 {
3130 v6 = 0; 3132 v6 = 0;
3131 if (uNumLoadedFiles > 0) 3133 if (uNumLoadedFiles > 0)
3132 { 3134 {