Mercurial > mm7
diff LOD.cpp @ 1165:29a8defbad9e
temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
removed double LOBYTE, LOWORD etd macro definitions
swprintf called with string size parameter
ErrD3D with too many params fix
1 or 2 other minor fixes
| author | Grumpy7 |
|---|---|
| date | Tue, 04 Jun 2013 03:21:21 +0200 |
| parents | 5d5c78088274 |
| children | 5450af4f57ef |
line wrap: on
line diff
--- a/LOD.cpp Tue Jun 04 02:03:43 2013 +0200 +++ b/LOD.cpp Tue Jun 04 03:21:21 2013 +0200 @@ -1,3 +1,7 @@ +#ifdef _MSC_VER +#define _CRT_SECURE_NO_WARNINGS +#endif + #include "LOD.h" #include "Render.h" #include "Allocator.h" @@ -2015,7 +2019,7 @@ if (bLinearSearch) { for (uint i = 0; i < uNumSubDirs; ++i) - if (!strcmpi(pContainer_Name, pSubIndices[i].pFilename)) + if (!_stricmp(pContainer_Name, pSubIndices[i].pFilename)) { v4 = pSubIndices[i].uOfsetFromSubindicesStart; fseek(pFile, uOffsetToSubIndex + v4, SEEK_SET); @@ -2640,9 +2644,9 @@ ptr_011BB4 = new char[1000]; memset(ptr_011BB4, 0, 1000); } - if (strnicmp(pContainer, "wtrdr", 5))//*v4 != 'w' || v4[1] != 't' || v4[2] != 'r' || v4[3] != 'd' || v4[4] != 'r' ) + if (_strnicmp(pContainer, "wtrdr", 5))//*v4 != 'w' || v4[1] != 't' || v4[2] != 'r' || v4[3] != 'd' || v4[4] != 'r' ) { - if (strnicmp(pContainer, "WtrTyl", 6))//if ( *v4 != 'W' || v4[1] != 't' || v4[2] != 'r' || v4[3] != 'T' || v4[4] != 'y' || v4[5] != 'l' ) + if (_strnicmp(pContainer, "WtrTyl", 6))//if ( *v4 != 'W' || v4[1] != 't' || v4[2] != 'r' || v4[3] != 'T' || v4[4] != 'y' || v4[5] != 'l' ) { v14 = uNumLoadedFiles; } @@ -2899,7 +2903,7 @@ areWeLoadingTexture = 1; for (uint i = 0; i < uNumLoadedFiles; ++i) - if (!strcmpi(pContainer, pTextures[i].pName)) + if (!_stricmp(pContainer, pTextures[i].pName)) return i; // if (!uNumLoadedFiles)