*Merge.

--HG--
branch : trunk

1 files changed, 2 insertions, 5 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 0989c4b4dab..b6aae4131d5 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -2429,6 +2429,8 @@ void InstanceMap::CreateInstanceData(bool load)
     if(!i_data)
         return;
 
+    i_data->Initialize();
+
     if(load)
     {
         // TODO: make a global storage for this
@@ -2445,11 +2447,6 @@ void InstanceMap::CreateInstanceData(bool load)
             delete result;
         }
     }
-    else
-    {
-        sLog.outDebug("New instance data, \"%s\" ,initialized!", objmgr.GetScriptName(i_script_id));
-        i_data->Initialize();
-    }
 }
 
 /*