[c12987] Fix a few more static code analysis warnings

(based on commit [12794] - 9acdf91) Signed-off-by: Xfurry <xfurry@scriptdev2.com>
cmangos · Nov 23, 2014 · 8f0065a · 8f0065a
1 parent 9e6701c
commit 8f0065a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp
@@ -854,7 +854,7 @@ void CalendarMgr::SendCalendarEvent(Player* player, CalendarEvent const* event,
     if (!player || !event)
         return;
 
-    std::string timeStr = TimeToTimestampStr(event->EventTime);
+    //std::string timeStr = TimeToTimestampStr(event->EventTime);
     DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "SendCalendarEvent> sendType[%u], CreatorGuid[%s], EventId["UI64FMTD"], Type[%u], Flags[%u], Title[%s]",
                      sendType, event->CreatorGuid.GetString().c_str(), event->EventId, uint32(event->Type), event->Flags, event->Title.c_str());
 

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
@@ -1396,7 +1396,7 @@ struct DoSpellProcEvent
             ++count;
     }
 
-    bool HasEntry(uint32 spellId) { return spe_map.count(spellId) > 0; }
+    bool HasEntry(uint32 spellId) { return spe_map.find(spellId) != spe_map.end(); }
     bool SetStateToEntry(uint32 spellId) { return (state = spe_map.find(spellId)) != spe_map.end(); }
     SpellProcEventMap& spe_map;
     SpellProcEventMap::const_iterator state;

diff --git a/src/game/World.cpp b/src/game/World.cpp
@@ -146,8 +146,7 @@ World::~World()
     VMAP::VMapFactory::clear();
     MMAP::MMapFactory::clear();
 
-    if (m_configForceLoadMapIds)
-        delete m_configForceLoadMapIds;
+    delete m_configForceLoadMapIds;
 
     // TODO free addSessQueue
 }

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12986"
+ #define REVISION_NR "12987"
 #endif // __REVISION_NR_H__