[Sc2-cvs] SF.net SVN: sc2:[3416] trunk/sc2/src/uqm

[<av...@us...>]

Revision: 3416
          http://sc2.svn.sourceforge.net/sc2/?rev=3416&view=rev
Author:   avolkov
Date:     2009-12-10 09:41:31 +0000 (Thu, 10 Dec 2009)

Log Message:
-----------
Cleanup: TaskContext removed; the only place using it now has an own context

Modified Paths:
--------------
    trunk/sc2/src/uqm/planets/planets.c
    trunk/sc2/src/uqm/planets/plangen.c
    trunk/sc2/src/uqm/setup.c
    trunk/sc2/src/uqm/setup.h

Modified: trunk/sc2/src/uqm/planets/planets.c
===================================================================
--- trunk/sc2/src/uqm/planets/planets.c	2009-12-10 09:26:57 UTC (rev 3415)
+++ trunk/sc2/src/uqm/planets/planets.c	2009-12-10 09:41:31 UTC (rev 3416)
@@ -217,7 +217,6 @@
 	}
 
 	StopMusic ();
-	TaskContext = CreateContext ("TaskContext");
 
 	pPlanetDesc = pSolarSysState->pOrbitalDesc;
 	GeneratePlanetSurface (pPlanetDesc, SurfDefFrame);
@@ -300,9 +299,6 @@
 		Orbit->ScratchArray = 0;
 	}
 
-	DestroyContext (TaskContext);
-	TaskContext = 0;
-	
 	DestroyStringTable (ReleaseStringTable (
 			pSolarSysState->SysInfo.PlanetInfo.DiscoveryString
 			));

Modified: trunk/sc2/src/uqm/planets/plangen.c
===================================================================
--- trunk/sc2/src/uqm/planets/plangen.c	2009-12-10 09:26:57 UTC (rev 3415)
+++ trunk/sc2/src/uqm/planets/plangen.c	2009-12-10 09:41:31 UTC (rev 3416)
@@ -104,10 +104,8 @@
 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 @@
 	}
 
 	SetContextFGFrame (OldFrame);
-	SetContext (OldContext);
 }
 
 static inline void
@@ -1732,13 +1729,15 @@
 	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 @@
 	}
 
 	SetContext (OldContext);
+	DestroyContext (TopoContext);
 
 	TFB_SeedRandom (old_seed);
 }

Modified: trunk/sc2/src/uqm/setup.c
===================================================================
--- trunk/sc2/src/uqm/setup.c	2009-12-10 09:26:57 UTC (rev 3415)
+++ trunk/sc2/src/uqm/setup.c	2009-12-10 09:41:31 UTC (rev 3416)
@@ -54,7 +54,6 @@
 CONTEXT SpaceContext;
 CONTEXT StatusContext;
 CONTEXT OffScreenContext;
-CONTEXT TaskContext;
 SIZE screen_width, screen_height;
 FRAME Screen;
 FONT StarConFont;

Modified: trunk/sc2/src/uqm/setup.h
===================================================================
--- trunk/sc2/src/uqm/setup.h	2009-12-10 09:26:57 UTC (rev 3415)
+++ trunk/sc2/src/uqm/setup.h	2009-12-10 09:41:31 UTC (rev 3416)
@@ -40,7 +40,6 @@
 extern CONTEXT ScreenContext;
 extern CONTEXT SpaceContext;
 extern CONTEXT StatusContext;
-extern CONTEXT TaskContext;
 
 extern SIZE screen_width, screen_height;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.