# HG changeset patch
# User rubidium
# Date 1164204842 0
# Node ID 4c5761bb0176259cc0dc785224b9c1e1055fe839
# Parent  4436139e3b99e9c6f341de47a4fd413a56e2f2e0
(svn r7237) -Fix: TGP landscape generation could leak memory if aborted during the generation of the heightmap.

diff -r 4436139e3b99 -r 4c5761bb0176 genworld.c
--- a/genworld.c	Wed Nov 22 08:49:40 2006 +0000
+++ b/genworld.c	Wed Nov 22 14:14:02 2006 +0000
@@ -165,6 +165,15 @@
 }
 
 /**
+ * Set here the function, if any, that you want to be called when landscape
+ *  generation is aborted.
+ */
+void GenerateWorldSetAbortCallback(gw_abort_proc *proc)
+{
+	_gw.abortp = proc;
+}
+
+/**
  * This will wait for the thread to finish up his work. It will not continue
  *  till the work is done.
  */
@@ -201,12 +210,15 @@
 	/* Clean up - in SE create an empty map, otherwise, go to intro menu */
 	_switch_mode = (_game_mode == GM_EDITOR) ? SM_EDITOR : SM_MENU;
 
+	if (_gw.abortp != NULL) _gw.abortp();
+
 	if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE);
 	/* Show all vital windows again, because we have hidden them */
 	if (_gw.threaded && _game_mode != GM_MENU) ShowVitalWindows();
 	_gw.active   = false;
 	_gw.thread   = NULL;
 	_gw.proc     = NULL;
+	_gw.abortp   = NULL;
 	_gw.threaded = false;
 
 	DeleteWindowById(WC_GENERATE_PROGRESS_WINDOW, 0);
@@ -229,6 +241,7 @@
 	_gw.size_y = size_y;
 	_gw.active = true;
 	_gw.abort  = false;
+	_gw.abortp = NULL;
 	_gw.lp     = _local_player;
 	_gw.wait_for_draw = false;
 	_gw.quit_thread   = false;
diff -r 4436139e3b99 -r 4c5761bb0176 genworld.h
--- a/genworld.h	Wed Nov 22 08:49:40 2006 +0000
+++ b/genworld.h	Wed Nov 22 14:14:02 2006 +0000
@@ -25,6 +25,7 @@
 };
 
 typedef void gw_done_proc(void);
+typedef void gw_abort_proc(void);
 
 typedef struct gw_info {
 	bool active;           //! Is generating world active
@@ -37,6 +38,7 @@
 	uint size_x;           //! X-size of the map
 	uint size_y;           //! Y-size of the map
 	gw_done_proc *proc;    //! Proc that is called when done (can be NULL)
+	gw_abort_proc *abortp; //! Proc that is called when aborting (can be NULL)
 	OTTDThread *thread;    //! The thread we are in (can be NULL)
 } gw_info;
 
@@ -74,6 +76,7 @@
 bool IsGeneratingWorldReadyForPaint(void);
 bool IsGenerateWorldThreaded(void);
 void GenerateWorldSetCallback(gw_done_proc *proc);
+void GenerateWorldSetAbortCallback(gw_abort_proc *proc);
 void WaitTillGeneratedWorld(void);
 void GenerateWorld(int mode, uint size_x, uint size_y);
 void AbortGeneratingWorld(void);
diff -r 4436139e3b99 -r 4c5761bb0176 tgp.c
--- a/tgp.c	Wed Nov 22 08:49:40 2006 +0000
+++ b/tgp.c	Wed Nov 22 14:14:02 2006 +0000
@@ -798,6 +798,8 @@
 	uint x, y;
 
 	if (!AllocHeightMap()) return;
+	GenerateWorldSetAbortCallback(FreeHeightMap);
+
 	HeightMapGenerate();
 
 	IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
@@ -823,4 +825,5 @@
 	for (x = 0; x < _height_map.size_x;     x++) MakeVoid(_height_map.size_x * y + x);
 
 	FreeHeightMap();
+	GenerateWorldSetAbortCallback(NULL);
 }