Fix minor memory leak on loading/unloading transporters.

DROID::sMove.asPath is set to NULL on unloading droids, but was never freed. Also, clear any remaining pathfinding job for the droid on loading transporter.
Warzone2100 · Jun 23, 2012 · 032956e · 032956e
1 parent 88e9439
commit 032956e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/droid.cpp b/src/droid.cpp
@@ -1898,6 +1898,7 @@ DROID *reallyBuildDroid(DROID_TEMPLATE *pTemplate, Position pos, UDWORD player,
 	// Initialise the movement stuff
 	psDroid->baseSpeed = calcDroidBaseSpeed(pTemplate, psDroid->weight, (UBYTE)player);
 
+	psDroid->sMove.asPath = NULL;
 	initDroidMovement(psDroid);
 
 	// it was never drawn before
@@ -1988,6 +1989,7 @@ DROID *buildDroid(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UDWORD player,
 //initialises the droid movement model
 void initDroidMovement(DROID *psDroid)
 {
+	free(psDroid->sMove.asPath);
 	memset(&psDroid->sMove, 0, sizeof(MOVE_CONTROL));
 }
 

diff --git a/src/transporter.cpp b/src/transporter.cpp
@@ -1437,6 +1437,7 @@ void transporterAddDroid(DROID *psTransporter, DROID *psDroidToAdd)
 	{
 		visRemoveVisibility((BASE_OBJECT *)psDroidToAdd);
 	}
+	fpathRemoveDroidData(psDroidToAdd->id);
 
 	// This is called by droidRemove. But we still need to refresh after adding to the transporter group.
 	intRefreshScreen();