Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More map cleanup 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2989 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-12-06 22:08:19 +00:00
parent d7f6d50a5c
commit c7aca00f05
1 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/map.c
View File

@ -320,7 +320,6 @@ BOOL mapLoad(char *pFileData, UDWORD fileSize)
{
UDWORD width,height;
MAP_SAVEHEADER *psHeader;
BOOL mapAlloc;
/* Check the file type */
psHeader = (MAP_SAVEHEADER *)pFileData;
@ -364,42 +363,14 @@ BOOL mapLoad(char *pFileData, UDWORD fileSize)
}
/* See if this is the first time a map has been loaded */
mapAlloc = TRUE;
if (psMapTiles != NULL)
{
if (mapWidth == width && mapHeight == height)
{
mapAlloc = FALSE;
}
else
{
/* Clear all the objects off the map and free up the map memory */
freeAllDroids();
freeAllStructs();
freeAllFeatures();
proj_FreeAllProjectiles();
// free(psMapTiles);
free(aMapLinePoints);
psMapTiles = NULL;
aMapLinePoints = NULL;
}
}
ASSERT(psMapTiles == NULL, "Map has not been cleared before calling mapLoad()!");
/* Allocate the memory for the map */
if (mapAlloc)
{
psMapTiles = (MAPTILE *)malloc(sizeof(MAPTILE) * width*height);
if (psMapTiles == NULL)
{
debug( LOG_ERROR, "mapLoad: Out of memory" );
abort();
return FALSE;
}
memset(psMapTiles, 0, sizeof(MAPTILE) * width*height);
psMapTiles = calloc(width * height, sizeof(MAPTILE));
ASSERT(psMapTiles != NULL, "mapLoad: Out of memory" );
mapWidth = width;
mapHeight = height;
}
mapWidth = width;
mapHeight = height;
//load in the map data itself
mapLoadV3(pFileData, fileSize);