From 3cb4a52d592c61877155d0c2e0e944e9ab4fe0de Mon Sep 17 00:00:00 2001 From: azazel Date: Mon, 29 Nov 2010 15:50:38 +0600 Subject: Core/Misc: fix some warnings. As a result removed one redundant hook from FormulaScript. --HG-- branch : trunk --- src/server/game/Scripting/ScriptMgr.cpp | 9 ++------- src/server/game/Scripting/ScriptMgr.h | 8 ++------ 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'src/server/game/Scripting') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index a671247c10a..1e07ab1c4ad 100755 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -422,14 +422,9 @@ void ScriptMgr::OnWorldUpdate(uint32 diff) FOREACH_SCRIPT(WorldScript)->OnUpdate(NULL, diff); } -void ScriptMgr::OnHonorCalculation(float& honor, uint8 level, uint32 count) +void ScriptMgr::OnHonorCalculation(float& honor, uint8 level, float multiplier) { - FOREACH_SCRIPT(FormulaScript)->OnHonorCalculation(honor, level, count); -} - -void ScriptMgr::OnHonorCalculation(uint32& honor, uint8 level, uint32 count) -{ - FOREACH_SCRIPT(FormulaScript)->OnHonorCalculation(honor, level, count); + FOREACH_SCRIPT(FormulaScript)->OnHonorCalculation(honor, level, multiplier); } void ScriptMgr::OnGrayLevelCalculation(uint8& grayLevel, uint8 playerLevel) diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index f2ec1cdf9ab..f7239425ab7 100755 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -279,10 +279,7 @@ class FormulaScript : public ScriptObject public: // Called after calculating honor. - virtual void OnHonorCalculation(float& /*honor*/, uint8 /*level*/, uint32 /*count*/) { } - - // Called after calculating honor. - virtual void OnHonorCalculation(uint32& /*honor*/, uint8 /*level*/, uint32 /*count*/) { } + virtual void OnHonorCalculation(float& /*honor*/, uint8 /*level*/, float /*multiplier*/) { } // Called after gray level calculation. virtual void OnGrayLevelCalculation(uint8& /*grayLevel*/, uint8 /*playerLevel*/) { } @@ -807,8 +804,7 @@ class ScriptMgr public: /* FormulaScript */ - void OnHonorCalculation(float& honor, uint8 level, uint32 count); - void OnHonorCalculation(uint32& honor, uint8 level, uint32 count); + void OnHonorCalculation(float& honor, uint8 level, float multiplier); void OnGrayLevelCalculation(uint8& grayLevel, uint8 playerLevel); void OnColorCodeCalculation(XPColorChar& color, uint8 playerLevel, uint8 mobLevel); void OnZeroDifferenceCalculation(uint8& diff, uint8 playerLevel); -- cgit v1.2.3