Fix TC build, analysis warnings and triggering addon message hooks

This commit is contained in:
Rochet2
2015-01-06 12:43:53 +02:00
parent 6371728547
commit 5e7b0ee0f7
6 changed files with 28 additions and 28 deletions

View File

@@ -45,7 +45,7 @@ ElunaEventProcessor::ElunaEventProcessor(Eluna** _E, WorldObject* _obj) : m_time
{
if (obj)
{
EventMgr::WriteGuard lock((*E)->eventMgr->GetLock());
EventMgr::WriteGuard guard((*E)->eventMgr->GetLock());
(*E)->eventMgr->processors.insert(this);
}
}
@@ -56,7 +56,7 @@ ElunaEventProcessor::~ElunaEventProcessor()
if (obj && Eluna::initialized)
{
EventMgr::WriteGuard lock((*E)->eventMgr->GetLock());
EventMgr::WriteGuard guard((*E)->eventMgr->GetLock());
(*E)->eventMgr->processors.erase(this);
}
}
@@ -133,7 +133,7 @@ EventMgr::EventMgr(Eluna** _E) : globalProcessor(new ElunaEventProcessor(_E, NUL
EventMgr::~EventMgr()
{
{
ReadGuard lock(GetLock());
ReadGuard guard(GetLock());
if (!processors.empty())
for (ProcessorSet::const_iterator it = processors.begin(); it != processors.end(); ++it) // loop processors
(*it)->RemoveEvents_internal();
@@ -145,7 +145,7 @@ EventMgr::~EventMgr()
void EventMgr::RemoveEvents()
{
ReadGuard lock(GetLock());
ReadGuard guard(GetLock());
if (!processors.empty())
for (ProcessorSet::const_iterator it = processors.begin(); it != processors.end(); ++it) // loop processors
(*it)->RemoveEvents();
@@ -154,7 +154,7 @@ void EventMgr::RemoveEvents()
void EventMgr::RemoveEvent(int eventId)
{
ReadGuard lock(GetLock());
ReadGuard guard(GetLock());
if (!processors.empty())
for (ProcessorSet::const_iterator it = processors.begin(); it != processors.end(); ++it) // loop processors
(*it)->RemoveEvent(eventId);