diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/map_extractor/loadlib.cpp | 12 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 21 |
2 files changed, 8 insertions, 25 deletions
diff --git a/src/tools/map_extractor/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp index 6a47f2d2a30..d549a0c96f4 100644 --- a/src/tools/map_extractor/loadlib.cpp +++ b/src/tools/map_extractor/loadlib.cpp @@ -30,19 +30,17 @@ bool FileLoader::loadFile(HANDLE mpq, char* filename, bool log) data_size = SFileGetFileSize(file, NULL); data = new uint8[data_size]; - if (data) + SFileReadFile(file, data, data_size, NULL/*bytesRead*/, NULL); + if (prepareLoadedData()) { - SFileReadFile(file, data, data_size, NULL/*bytesRead*/, NULL); - if (prepareLoadedData()) - { - SFileCloseFile(file); - return true; - } + SFileCloseFile(file); + return true; } printf("Error loading %s\n", filename); SFileCloseFile(file); free(); + return false; } diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index ab584e27e03..9c2dda51621 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -571,19 +571,7 @@ namespace MMAP // merge per tile poly and detail meshes rcPolyMesh** pmmerge = new rcPolyMesh*[TILES_PER_MAP * TILES_PER_MAP]; - if (!pmmerge) - { - printf("%s alloc pmmerge FIALED!\n", tileString); - return; - } - rcPolyMeshDetail** dmmerge = new rcPolyMeshDetail*[TILES_PER_MAP * TILES_PER_MAP]; - if (!dmmerge) - { - printf("%s alloc dmmerge FIALED!\n", tileString); - return; - } - int nmerge = 0; // build all tiles for (int y = 0; y < TILES_PER_MAP; ++y) @@ -678,12 +666,9 @@ namespace MMAP rcFreeContourSet(tile.cset); tile.cset = NULL; - if (tile.pmesh) - { - pmmerge[nmerge] = tile.pmesh; - dmmerge[nmerge] = tile.dmesh; - nmerge++; - } + pmmerge[nmerge] = tile.pmesh; + dmmerge[nmerge] = tile.dmesh; + nmerge++; } } |