aboutsummaryrefslogtreecommitdiff
path: root/src/tools/mmaps_generator
diff options
context:
space:
mode:
authorSebastian Valle <s.v.h21@hotmail.com>2013-09-03 15:09:37 -0500
committerSebastian Valle <s.v.h21@hotmail.com>2013-09-03 15:09:37 -0500
commit24f8b2b994bb22f460bf304936cfc8a57e1c1220 (patch)
tree178cf58b337bb9c34dce277424ba090137dc30a3 /src/tools/mmaps_generator
parent5b95301de51e7706ce07a5f2c185ab32decc23f7 (diff)
Core/Misc: Fixed some more issues found by code analysis tools.
Diffstat (limited to 'src/tools/mmaps_generator')
-rw-r--r--src/tools/mmaps_generator/MapBuilder.cpp21
1 files changed, 3 insertions, 18 deletions
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++;
}
}