Mercurial > might-and-magic-trilogy
diff Outdoor.cpp @ 104:62bfa3ffe7db
2.11.12
author | Ritor1 |
---|---|
date | Fri, 02 Nov 2012 10:04:08 +0600 |
parents | 5159d2e6f559 |
children | e633cde38d64 |
line wrap: on
line diff
--- a/Outdoor.cpp Mon Oct 29 09:28:08 2012 +0600 +++ b/Outdoor.cpp Fri Nov 02 10:04:08 2012 +0600 @@ -366,7 +366,7 @@ { v12 = (unsigned __int8)aTiletableLoadU[v10 + 39]; uDefaultTravelTime_ByFoot = (unsigned __int8)byte_4ECA93[v10]; - sprintfex(pOut, "out%02d.odm", v12); + sprintf(pOut, "out%02d.odm", v12); uLevel_StartingPointType = (unsigned __int8)byte_4ECACF[v10]; return 1; } @@ -715,7 +715,12 @@ pAllocator->FreeChunk(v2); v3 = v1->pAttributemap; v1->pTilemap = 0; - pAllocator->FreeChunk(v3); + if (v3) + { + pAllocator->FreeChunk(v3); + v3 = nullptr; + } + //pAllocator->FreeChunk(v3);// v4 = v1->ptr_C; v1->pAttributemap = 0; pAllocator->FreeChunk(v4); @@ -1336,7 +1341,7 @@ } LABEL_8: _6807E0_num_decorations_6807B8 = 0; - sprintfex(FileName, "levels\\%s", pContainer); + sprintf(FileName, "levels\\%s", pContainer); if ( GetFileAttributesA(FileName) != -1 ) { result = (bool)fopen(FileName, "rb"); @@ -1412,7 +1417,7 @@ v5->pBModels[v12].pNodes = 0; FileName[0] = 0; v108 = (int)&v5->pBModels[v12]; - sprintfex(FileName, "%s", v108); + sprintf(FileName, "%s", v108); v13 = v5->pBModels; v138 = 0; v5->pBModels[v12].pVertices.pVertices = (Vec3_int_ *)pAllocator->AllocNamedChunk( @@ -1727,7 +1732,7 @@ v5->pBModels[v48].pNodes = 0; FileName[0] = 0; v108 = (int)&v5->pBModels[v48]; - sprintfex(FileName, "%s", v108); + sprintf(FileName, "%s", v108); v49 = v5->pBModels; v138 = 0; v50 = &v49[v48]; @@ -1902,7 +1907,7 @@ v108 = (int)".ddm"; v73 = strlen(pContainer); strcpy((char *)v141 + v73, (const char *)v108); - v151 = (int)pNew_LOD->FindContainer(pContainer, 1); + v151 = (int)pNew_LOD->FindContainer(pContainer, 1); // fread(&header, 0x10u, 1u, (FILE *)v151); Str2 = 0; if ( header.uVersion != 91969 @@ -2173,7 +2178,7 @@ v108 = dword_4EC268[rand() % dword_4EC2A8]; else v108 = dword_4EC28C[rand() % dword_4EC2AC]; - sprintfex(v5->field_4F8, "plansky%d", v108); + sprintf(v5->field_4F8, "plansky%d", v108); } } else