From 5415199305d2c43da0df388f4def9d61d0de1aa2 Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Thu, 10 Dec 2009 09:41:31 +0000
Subject: [PATCH] Cleanup: TaskContext removed; the only place using it now has
 an own context

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3416 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/uqm/planets/planets.c | 4 ----
 sc2/src/uqm/planets/plangen.c | 8 ++++----
 sc2/src/uqm/setup.c           | 1 -
 sc2/src/uqm/setup.h           | 1 -
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/sc2/src/uqm/planets/planets.c b/sc2/src/uqm/planets/planets.c
index 820f88dc7..9192239ab 100644
--- a/sc2/src/uqm/planets/planets.c
+++ b/sc2/src/uqm/planets/planets.c
@@ -217,7 +217,6 @@ LoadPlanet (FRAME SurfDefFrame)
 	}
 
 	StopMusic ();
-	TaskContext = CreateContext ("TaskContext");
 
 	pPlanetDesc = pSolarSysState->pOrbitalDesc;
 	GeneratePlanetSurface (pPlanetDesc, SurfDefFrame);
@@ -300,9 +299,6 @@ FreePlanet (void)
 		Orbit->ScratchArray = 0;
 	}
 
-	DestroyContext (TaskContext);
-	TaskContext = 0;
-	
 	DestroyStringTable (ReleaseStringTable (
 			pSolarSysState->SysInfo.PlanetInfo.DiscoveryString
 			));
diff --git a/sc2/src/uqm/planets/plangen.c b/sc2/src/uqm/planets/plangen.c
index fbeb37dba..25547ff9c 100644
--- a/sc2/src/uqm/planets/plangen.c
+++ b/sc2/src/uqm/planets/plangen.c
@@ -104,10 +104,8 @@ typedef struct
 static void
 RenderTopography (FRAME DstFrame, BYTE *pTopoData, int w, int h)
 {
-	CONTEXT OldContext;
 	FRAME OldFrame;
 
-	OldContext = SetContext (TaskContext);
 	OldFrame = SetContextFGFrame (DstFrame);
 
 	if (pSolarSysState->XlatRef == 0)
@@ -205,7 +203,6 @@ RenderTopography (FRAME DstFrame, BYTE *pTopoData, int w, int h)
 	}
 
 	SetContextFGFrame (OldFrame);
-	SetContext (OldContext);
 }
 
 static inline void
@@ -1732,13 +1729,15 @@ GeneratePlanetSurface (PLANET_DESC *pPlanetDesc, FRAME SurfDefFrame)
 	COUNT i, y;
 	POINT loc;
 	CONTEXT OldContext;
+	CONTEXT TopoContext;
 	PLANET_ORBIT *Orbit = &pSolarSysState->Orbit;
 	BYTE *pScaledTopo = 0;
 	BOOLEAN shielded = (pPlanetDesc->data_index & PLANET_SHIELDED) != 0;
 
 	old_seed = TFB_SeedRandom (pPlanetDesc->rand_seed);
 
-	OldContext = SetContext (TaskContext);
+	TopoContext = CreateContext ("Plangen.TopoContext");
+	OldContext = SetContext (TopoContext);
 	planet_orbit_init ();
 
 	PlanDataPtr = &PlanData[pPlanetDesc->data_index & ~PLANET_SHIELDED];
@@ -1952,6 +1951,7 @@ GeneratePlanetSurface (PLANET_DESC *pPlanetDesc, FRAME SurfDefFrame)
 	}
 
 	SetContext (OldContext);
+	DestroyContext (TopoContext);
 
 	TFB_SeedRandom (old_seed);
 }
diff --git a/sc2/src/uqm/setup.c b/sc2/src/uqm/setup.c
index ea725177f..7cc02d820 100644
--- a/sc2/src/uqm/setup.c
+++ b/sc2/src/uqm/setup.c
@@ -54,7 +54,6 @@ CONTEXT ScreenContext;
 CONTEXT SpaceContext;
 CONTEXT StatusContext;
 CONTEXT OffScreenContext;
-CONTEXT TaskContext;
 SIZE screen_width, screen_height;
 FRAME Screen;
 FONT StarConFont;
diff --git a/sc2/src/uqm/setup.h b/sc2/src/uqm/setup.h
index f01e86306..f75e90558 100644
--- a/sc2/src/uqm/setup.h
+++ b/sc2/src/uqm/setup.h
@@ -40,7 +40,6 @@ extern CONTEXT OffScreenContext;
 extern CONTEXT ScreenContext;
 extern CONTEXT SpaceContext;
 extern CONTEXT StatusContext;
-extern CONTEXT TaskContext;
 
 extern SIZE screen_width, screen_height;