*Merge.
--HG-- branch : trunk
This commit is contained in:
commit
db817d668a
13 files changed
+179
-34
No files matched your search
+2
-5
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in new issue
Block a user