Don't shutdown the map on (specific) SP missions, it still is in use …

…for away missions when we come back. If said map is shutdown, then instead of crashing, this just makes it so you don't see textures. Note for the future: Perhaps it is better to just abort out instead, since it means that we shutdown the map when we were not supposed to... fixes ticket:2265 fixes ticket:2256
Warzone2100 · Oct 27, 2010 · f340607 · f340607
1 parent 0ca897a
commit f340607
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/mission.c b/src/mission.c
@@ -870,8 +870,12 @@ void restoreMissionData(void)
 	freeAllStructs();
 	freeAllFeatures();
 	gwShutDown();
-	mapShutdown();
-
+	if (game.type != CAMPAIGN)
+	{
+		// we don't want this to happen on missions
+		ASSERT(false, "mapShutDown() is being called");
+		mapShutdown();
+	}
 	//restore the game pointers
 	for (inc = 0; inc < MAX_PLAYERS; inc++)
 	{

diff --git a/src/terrain.c b/src/terrain.c
@@ -1264,6 +1264,8 @@ void drawTerrain(void)
 
 	glBindBuffer(GL_ARRAY_BUFFER, textureVBO);
 
+	ASSERT_OR_RETURN( , psGroundTypes, "Ground type was not set, no textures will be seen.");
+
 	// draw each layer separately
 	for (layer = 0; layer < numGroundTypes; layer++)
 	{