*Merge some fixes from tc1

--HG--
branch : trunk

1 files changed, 5 insertions, 2 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 3884f39f5a4..140904bfb19 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -120,7 +120,7 @@ void Map::LoadVMap(int gx,int gy)
     }
 }
 
-void Map::LoadMap(int gx,int gy)
+void Map::LoadMap(int gx,int gy, bool reload)
 {
     if( i_InstanceId != 0 )
     {
@@ -138,6 +138,9 @@ void Map::LoadMap(int gx,int gy)
         return;
     }
 
+    if(GridMaps[gx][gy] && !reload)
+        return;
+
     //map already load, delete it before reloading (Is it necessary? Do we really need the ability the reload maps during runtime?)
     if(GridMaps[gx][gy])
     {
@@ -2503,7 +2506,7 @@ void InstanceMap::CreateInstanceData(bool load)
         {
             Field* fields = result->Fetch();
             const char* data = fields[0].GetString();
-            if(data)
+            if(data && data != "")
             {
                 sLog.outDebug("Loading instance data for `%s` with id %u", objmgr.GetScriptName(i_script_id), i_InstanceId);
                 i_data->Load(data);