aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/AuctionHouse/AuctionHouseMgr.h2
-rwxr-xr-xsrc/server/game/Chat/Chat.h2
-rwxr-xr-xsrc/server/game/Chat/Commands/Level3.cpp2
-rwxr-xr-xsrc/server/game/Entities/Object/Object.h4
-rwxr-xr-xsrc/server/game/Entities/Object/Updates/UpdateData.h2
-rwxr-xr-xsrc/server/game/Entities/Player/Player.cpp13
-rwxr-xr-xsrc/server/game/Groups/Group.h2
-rwxr-xr-xsrc/server/game/Instances/InstanceSaveMgr.h6
-rwxr-xr-xsrc/server/game/Reputation/ReputationMgr.h2
-rwxr-xr-xsrc/server/game/Scripting/MapScripts.cpp4
-rwxr-xr-xsrc/server/game/Spells/Auras/SpellAuras.cpp4
-rwxr-xr-xsrc/server/game/Spells/SpellEffects.cpp2
-rw-r--r--src/server/scripts/World/go_scripts.cpp4
-rw-r--r--src/tools/vmap3_extractor/vmapexport.cpp13
14 files changed, 23 insertions, 39 deletions
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index 6cfc6d07e0b..5e88ae1ff1d 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -90,7 +90,7 @@ class AuctionHouseObject
typedef std::map<uint32, AuctionEntry*> AuctionEntryMap;
- uint32 Getcount() { return AuctionsMap.size(); }
+ uint32 Getcount() const { return AuctionsMap.size(); }
AuctionEntryMap::iterator GetAuctionsBegin() {return AuctionsMap.begin();}
AuctionEntryMap::iterator GetAuctionsEnd() {return AuctionsMap.end();}
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index d7a9c0b66f5..b3d9ae1e262 100755
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -119,7 +119,7 @@ class ChatHandler
GameObject* GetNearbyGameObject();
GameObject* GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid, uint32 entry);
- bool HasSentErrorMessage() { return sentErrorMessage;}
+ bool HasSentErrorMessage() const { return sentErrorMessage;}
void SetSentErrorMessage(bool val){ sentErrorMessage = val;};
static bool LoadCommandTable() { return load_command_table;}
static void SetLoadCommandTable(bool val){ load_command_table = val;};
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index c7dec515d3c..5f2b39fcb4f 100755
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -4208,8 +4208,6 @@ bool ChatHandler::HandleServerSetMotdCommand(const char *args)
/// Set whether we accept new clients
bool ChatHandler::HandleServerSetClosedCommand(const char *args)
{
- std::string arg = args;
-
if (strncmp(args, "on", 3) == 0)
{
SendSysMessage(LANG_WORLD_CLOSED);
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index 9de040714e5..3364ae338a9 100755
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -407,11 +407,11 @@ struct Position
Position::PositionXYZStreamer PositionXYZStream()
{
- return Position::PositionXYZStreamer(*this);
+ return PositionXYZStreamer(*this);
}
Position::PositionXYZOStreamer PositionXYZOStream()
{
- return Position::PositionXYZOStreamer(*this);
+ return PositionXYZOStreamer(*this);
}
bool IsPositionValid() const;
diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h
index 87e98ead61c..2d102f63e59 100755
--- a/src/server/game/Entities/Object/Updates/UpdateData.h
+++ b/src/server/game/Entities/Object/Updates/UpdateData.h
@@ -56,7 +56,7 @@ class UpdateData
void AddOutOfRangeGUID(uint64 guid);
void AddUpdateBlock(const ByteBuffer &block);
bool BuildPacket(WorldPacket* packet);
- bool HasData() { return m_blockCount > 0 || !m_outOfRangeGUIDs.empty(); }
+ bool HasData() const { return m_blockCount > 0 || !m_outOfRangeGUIDs.empty(); }
void Clear();
std::set<uint64> const& GetOutOfRangeGUIDs() const { return m_outOfRangeGUIDs; }
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 58a297a8b2c..8742deb2eb5 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -7949,23 +7949,16 @@ void Player::_ApplyItemBonuses(ItemTemplate const *proto, uint8 slot, bool apply
if (CanUseAttackType(attType))
_ApplyWeaponDamage(slot, proto, ssv, apply);
- int32 extraDPS = ssv->getDPSMod(proto->ScalingStatValue);
-
// Apply feral bonus from ScalingStatValue if set
if (ssv)
- {
if (int32 feral_bonus = ssv->getFeralBonus(proto->ScalingStatValue))
ApplyFeralAPBonus(feral_bonus, apply);
- }
+
// Druids get feral AP bonus from weapon dps (lso use DPS from ScalingStatValue)
if (getClass() == CLASS_DRUID)
- {
- int32 feral_bonus = proto->getFeralBonus(extraDPS);
- if (feral_bonus > 0)
+ if (int32 feral_bonus = proto->getFeralBonus(ssv->getDPSMod(proto->ScalingStatValue)))
ApplyFeralAPBonus(feral_bonus, apply);
- }
-
- }
+}
void Player::_ApplyWeaponDamage(uint8 slot, ItemTemplate const *proto, ScalingStatValuesEntry const *ssv, bool apply)
{
diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h
index 083e6e15225..a48b33a8624 100755
--- a/src/server/game/Groups/Group.h
+++ b/src/server/game/Groups/Group.h
@@ -214,7 +214,7 @@ class Group
uint64 GetLooterGuid() const;
ItemQualities GetLootThreshold() const;
- uint32 GetDbStoreId() { return m_dbStoreId; };
+ uint32 GetDbStoreId() const { return m_dbStoreId; };
// member manipulation methods
bool IsMember(uint64 guid) const;
diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index 7981cf39b7c..82a45a6fd03 100755
--- a/src/server/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
@@ -55,8 +55,8 @@ class InstanceSave
or when the instance is reset */
~InstanceSave();
- uint8 GetPlayerCount() { return m_playerList.size(); }
- uint8 GetGroupCount() { return m_groupList.size(); }
+ uint8 GetPlayerCount() const { return m_playerList.size(); }
+ uint8 GetGroupCount() const { return m_groupList.size(); }
/* A map corresponding to the InstanceId/MapId does not always exist.
InstanceSave objects may be created on player logon but the maps are
@@ -136,7 +136,7 @@ class InstanceSaveManager
InstResetEvent() : type(0), difficulty(DUNGEON_DIFFICULTY_NORMAL), mapid(0), instanceId(0) {}
InstResetEvent(uint8 t, uint32 _mapid, Difficulty d, uint16 _instanceid)
: type(t), difficulty(d), mapid(_mapid), instanceId(_instanceid) {}
- bool operator == (const InstResetEvent& e) { return e.instanceId == instanceId; }
+ bool operator == (const InstResetEvent& e) const { return e.instanceId == instanceId; }
};
typedef std::multimap<time_t /*resetTime*/, InstResetEvent> ResetTimeQueue;
diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h
index 4a6c60456eb..bb22f46585a 100755
--- a/src/server/game/Reputation/ReputationMgr.h
+++ b/src/server/game/Reputation/ReputationMgr.h
@@ -101,7 +101,7 @@ class ReputationMgr
ReputationRank GetRank(FactionEntry const* factionEntry) const;
ReputationRank GetBaseRank(FactionEntry const* factionEntry) const;
- uint32 GetReputationRankStrIndex(FactionEntry const* factionEntry)
+ uint32 GetReputationRankStrIndex(FactionEntry const* factionEntry) const
{
return ReputationRankStrIndex[GetRank(factionEntry)];
};
diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp
index 088e5eb1e75..f5e6f3f320e 100755
--- a/src/server/game/Scripting/MapScripts.cpp
+++ b/src/server/game/Scripting/MapScripts.cpp
@@ -364,9 +364,7 @@ void Map::ScriptsProcess()
break;
}
}
- // Some information for error messages
- std::string tableName = GetScriptsTableNameByType(step.script->type);
- std::string commandName = GetScriptCommandName(step.script->command);
+
switch (step.script->command)
{
case SCRIPT_COMMAND_TALK:
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index e3dd1e83105..a5cf014e3d3 100755
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -2299,10 +2299,6 @@ void UnitAura::Remove(AuraRemoveMode removeMode)
void UnitAura::FillTargetMap(std::map<Unit *, uint8> & targets, Unit* caster)
{
- Player* modOwner = NULL;
- if (caster)
- modOwner = caster->GetSpellModOwner();
-
for (uint8 effIndex = 0; effIndex < MAX_SPELL_EFFECTS ; ++effIndex)
{
if (!HasEffect(effIndex))
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 3a15516dc63..93f9640b92a 100755
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -5857,7 +5857,7 @@ void Spell::EffectReputation(SpellEffIndex effIndex)
}
// Bonus from spells that increase reputation gain
- float bonus = rep_change * _player->GetTotalAuraModifier(SPELL_AURA_MOD_REPUTATION_GAIN) / 100.0; // 10%
+ float bonus = rep_change * _player->GetTotalAuraModifier(SPELL_AURA_MOD_REPUTATION_GAIN) / 100.0f; // 10%
rep_change += (int32)bonus;
_player->GetReputationMgr().ModifyReputation(factionEntry, rep_change);
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index fba7b44d789..d99501f6aaa 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -313,10 +313,10 @@ public:
{
if (!creature->IsHostileTo(player))
{
- uint32 Spell = 0;
-
if (FactionTemplateEntry const* pFaction = creature->getFactionTemplateEntry())
{
+ uint32 Spell = 0;
+
switch(pFaction->faction)
{
case 1011: Spell = SPELL_REP_LC; break;
diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index 2be03d85d97..689691e1d91 100644
--- a/src/tools/vmap3_extractor/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
@@ -379,17 +379,16 @@ bool processArgv(int argc, char ** argv, const char *versionString)
{
bool result = true;
hasInputPathParam = false;
- bool preciseVectorData = false;
- for(int i=1; i< argc; ++i)
+ for (int i=1; i < argc; ++i)
{
- if(strcmp("-s",argv[i]) == 0)
+ if (strcmp("-s", argv[i]) == 0)
{
preciseVectorData = false;
}
- else if(strcmp("-d",argv[i]) == 0)
+ else if (strcmp("-d", argv[i]) == 0)
{
- if((i+1)<argc)
+ if ((i + 1) < argc)
{
hasInputPathParam = true;
strcpy(input_path, argv[i+1]);
@@ -402,11 +401,11 @@ bool processArgv(int argc, char ** argv, const char *versionString)
result = false;
}
}
- else if(strcmp("-?",argv[1]) == 0)
+ else if (strcmp("-?", argv[1]) == 0)
{
result = false;
}
- else if(strcmp("-l",argv[i]) == 0)
+ else if (strcmp("-l", argv[i]) == 0)
{
preciseVectorData = true;
}