diff options
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Battlefield/BattlefieldWG.cpp | 3 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_disable.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_modify.cpp | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/server/scripts/Battlefield/BattlefieldWG.cpp b/src/server/scripts/Battlefield/BattlefieldWG.cpp index 529e75c6af9..9aa93d76ca1 100644 --- a/src/server/scripts/Battlefield/BattlefieldWG.cpp +++ b/src/server/scripts/Battlefield/BattlefieldWG.cpp @@ -24,6 +24,7 @@ #include "BattlefieldMgr.h" #include "Battleground.h" #include "CreatureTextMgr.h" +#include "DBCStores.h" #include "GameObject.h" #include "GameTime.h" #include "Log.h" @@ -762,7 +763,7 @@ void BattlefieldWG::OnBattleEnd(bool endByTimer) // ******************************************************* void BattlefieldWG::DoCompleteOrIncrementAchievement(uint32 achievement, Player* player, uint8 /*incrementNumber*/) { - AchievementEntry const* achievementEntry = sAchievementMgr->GetAchievement(achievement); + AchievementEntry const* achievementEntry = sAchievementStore.LookupEntry(achievement); if (!achievementEntry) return; diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp index 25a2b4463c8..6345c118415 100644 --- a/src/server/scripts/Commands/cs_disable.cpp +++ b/src/server/scripts/Commands/cs_disable.cpp @@ -23,8 +23,8 @@ Category: commandscripts EndScriptData */ #include "ScriptMgr.h" -#include "AchievementMgr.h" #include "Chat.h" +#include "DBCStores.h" #include "DatabaseEnv.h" #include "DisableMgr.h" #include "Language.h" @@ -129,7 +129,7 @@ public: } case DISABLE_TYPE_ACHIEVEMENT_CRITERIA: { - if (!sAchievementMgr->GetAchievementCriteria(entry)) + if (!sAchievementCriteriaStore.LookupEntry(entry)) { handler->PSendSysMessage(LANG_COMMAND_NO_ACHIEVEMENT_CRITERIA_FOUND); handler->SetSentErrorMessage(true); diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 158be69baa2..8d89ec6ed40 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -554,12 +554,13 @@ public: } else { + uint32 moneyToAddMsg = moneyToAdd * -1; if (newmoney > static_cast<int32>(MAX_MONEY_AMOUNT)) newmoney = MAX_MONEY_AMOUNT; - handler->PSendSysMessage(LANG_YOU_TAKE_MONEY, abs(moneyToAdd), handler->GetNameLink(target).c_str()); + handler->PSendSysMessage(LANG_YOU_TAKE_MONEY, moneyToAddMsg, handler->GetNameLink(target).c_str()); if (handler->needReportToTarget(target)) - ChatHandler(target->GetSession()).PSendSysMessage(LANG_YOURS_MONEY_TAKEN, handler->GetNameLink().c_str(), abs(moneyToAdd)); + ChatHandler(target->GetSession()).PSendSysMessage(LANG_YOURS_MONEY_TAKEN, handler->GetNameLink().c_str(), moneyToAddMsg); target->SetMoney(newmoney); } } |