From 24f8b2b994bb22f460bf304936cfc8a57e1c1220 Mon Sep 17 00:00:00 2001 From: Sebastian Valle Date: Tue, 3 Sep 2013 15:09:37 -0500 Subject: Core/Misc: Fixed some more issues found by code analysis tools. --- src/tools/map_extractor/loadlib.cpp | 12 +++++------- src/tools/mmaps_generator/MapBuilder.cpp | 21 +++------------------ 2 files changed, 8 insertions(+), 25 deletions(-) (limited to 'src/tools') diff --git a/src/tools/map_extractor/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp index 5dcb479a11c..f5b0ac40875 100644 --- a/src/tools/map_extractor/loadlib.cpp +++ b/src/tools/map_extractor/loadlib.cpp @@ -34,13 +34,11 @@ bool FileLoader::loadFile(char *filename, bool log) data_size = mf.getSize(); data = new uint8 [data_size]; - if (data) - { - mf.read(data, data_size); - mf.close(); - if (prepareLoadedData()) - return true; - } + mf.read(data, data_size); + mf.close(); + if (prepareLoadedData()) + return true; + printf("Error loading %s", filename); mf.close(); free(); 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++; } } -- cgit v1.2.3