Core: Get rid of dirty operator workaround for ACE_Singleton class implementation
--HG-- branch : trunk
This commit is contained in:
@@ -61,7 +61,7 @@ bool Weather::Update(uint32 diff)
|
||||
}
|
||||
}
|
||||
|
||||
sScriptMgr.OnWeatherUpdate(this, diff);
|
||||
sScriptMgr->OnWeatherUpdate(this, diff);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -268,7 +268,7 @@ bool Weather::UpdateWeather()
|
||||
}
|
||||
sLog.outDetail("Change the weather of zone %u to %s.", m_zone, wthstr);
|
||||
|
||||
sScriptMgr.OnWeatherChange(this, state, m_grade);
|
||||
sScriptMgr->OnWeatherChange(this, state, m_grade);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -123,7 +123,7 @@ void WeatherMgr::LoadWeatherData()
|
||||
}
|
||||
}
|
||||
|
||||
wzc.ScriptId = sObjectMgr.GetScriptId(fields[13].GetCString());
|
||||
wzc.ScriptId = sObjectMgr->GetScriptId(fields[13].GetCString());
|
||||
|
||||
++count;
|
||||
}
|
||||
|
||||
@@ -63,6 +63,6 @@ class WeatherMgr
|
||||
WeatherZoneMap mWeatherZoneMap;
|
||||
};
|
||||
|
||||
#define sWeatherMgr (*ACE_Singleton<WeatherMgr, ACE_Null_Mutex>::instance())
|
||||
#define sWeatherMgr ACE_Singleton<WeatherMgr, ACE_Null_Mutex>::instance()
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user