aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Commands/cs_gobject.cpp2
-rw-r--r--src/server/scripts/Commands/cs_reload.cpp2
-rwxr-xr-xsrc/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp2
-rw-r--r--src/server/scripts/World/item_scripts.cpp2
-rwxr-xr-xsrc/server/shared/Database/MySQLConnection.cpp8
5 files changed, 9 insertions, 7 deletions
diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index f32ad232511..36e5cf84929 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -582,10 +582,12 @@ public:
uint32 lootId = 0;
if (!*args)
+ {
if (WorldObject * obj = handler->getSelectedObject())
entry = obj->GetEntry();
else
entry = atoi((char*)args);
+ }
GameObjectInfo const* goinfo = sObjectMgr.GetGameObjectInfo(entry);
diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp
index cf60f49cea9..aeb507cf344 100644
--- a/src/server/scripts/Commands/cs_reload.cpp
+++ b/src/server/scripts/Commands/cs_reload.cpp
@@ -164,7 +164,7 @@ public:
}
//reload commands
- static bool HandleReloadGMTicketsCommand(ChatHandler* handler, const char* /*args*/)
+ static bool HandleReloadGMTicketsCommand(ChatHandler* /*handler*/, const char* /*args*/)
{
sTicketMgr.LoadGMTickets();
return true;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
index af4b0e09791..154da5c9192 100755
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
@@ -375,7 +375,7 @@ class npc_bone_spike : public CreatureScript
events.ScheduleEvent(EVENT_FAIL_BONED, 8000);
}
- void UpdateAI(const uint32 diff)
+ void UpdateAI(const uint32 /*diff*/)
{
if (!trappedGUID)
return;
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index fa77089f8c5..a9a4972a339 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -500,7 +500,7 @@ public:
{
if (pPlayer->GetQuestStatus(QUEST_THE_PERFECT_SPIES) == QUEST_STATUS_INCOMPLETE)
{
- if (Creature* target = pPlayer->FindNearestCreature(NPC_VANIRAS_SENTRY_TOTEM, 10.0f))
+ if (pPlayer->FindNearestCreature(NPC_VANIRAS_SENTRY_TOTEM, 10.0f))
return false;
else
pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL);
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index 94244407c26..20c614b5333 100755
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -155,7 +155,7 @@ bool MySQLConnection::Execute(const char* sql)
return false;
{
- uint32 _s;
+ uint32 _s = 0;
if (sLog.GetSQLDriverQueryLogging())
_s = getMSTime();
@@ -191,7 +191,7 @@ bool MySQLConnection::Execute(PreparedStatement* stmt)
MYSQL_STMT* msql_STMT = m_mStmt->GetSTMT();
MYSQL_BIND* msql_BIND = m_mStmt->GetBind();
- uint32 _s;
+ uint32 _s = 0;
if (sLog.GetSQLDriverQueryLogging())
_s = getMSTime();
@@ -237,7 +237,7 @@ bool MySQLConnection::_Query(PreparedStatement* stmt, MYSQL_RES **pResult, uint6
MYSQL_STMT* msql_STMT = m_mStmt->GetSTMT();
MYSQL_BIND* msql_BIND = m_mStmt->GetBind();
- uint32 _s;
+ uint32 _s = 0;
if (sLog.GetSQLDriverQueryLogging())
_s = getMSTime();
@@ -294,7 +294,7 @@ bool MySQLConnection::_Query(const char *sql, MYSQL_RES **pResult, MYSQL_FIELD *
return false;
{
- uint32 _s;
+ uint32 _s = 0;
if (sLog.GetSQLDriverQueryLogging())
_s = getMSTime();