From 144d51a84ee5ee8b9d4fba09f310ca1e671fb2c2 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Mon, 2 Apr 2007 04:19:18 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@886 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientgame.cpp |  1 +
 source/src/world.cpp      | 11 +++++++----
 source/src/worldio.cpp    |  1 -
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 0ab6f04e..3d377414 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -576,6 +576,7 @@ extern void kickallbots(void);
 
 void startmap(char *name)   // called just after a map load
 {
+    clearminimap();
     //if(netmapstart()) { gamemode = 0;}  //needs fixed to switch modes?
     netmapstart(); //should work
     //monsterclear();
diff --git a/source/src/world.cpp b/source/src/world.cpp
index cb390b0c..baf85e55 100644
--- a/source/src/world.cpp
+++ b/source/src/world.cpp
@@ -369,13 +369,16 @@ void empty_world(int factor, bool force)    // main empty world creation routine
     }
     
     calclight();
-    startmap("");
+    if(factor>=0) startmap("");
     if(oldworld)
     {
         delete[] oldworld;
-        toggleedit();
-        execfile("config/default_map_settings.cfg");
-        execute("fullbright 1");
+        if(factor>=0)
+        {
+            toggleedit();
+            execfile("config/default_map_settings.cfg");
+            execute("fullbright 1");
+        }
     }
 }
 
diff --git a/source/src/worldio.cpp b/source/src/worldio.cpp
index b7e91e0b..03ceda5e 100644
--- a/source/src/worldio.cpp
+++ b/source/src/worldio.cpp
@@ -369,7 +369,6 @@ void load_world(char *mname)        // still supports all map formats that have
 	c2skeepalive();
 	preload_mapmodels();
 	c2skeepalive();
-    clearminimap();
 }
 
 COMMANDN(savemap, save_world, ARG_1STR);