Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core: Fix warnings

Browse Source
This commit is contained in:
Vincent-Michael
2013-06-29 01:56:44 +02:00
parent f4f09e3eb5
commit 08e2b03b28
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -6131,9 +6131,6 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
target = this;
break;
}
if (!victim)
return false;
// Holy Power (Redemption Armor set)
case 28789:
{
@@ -7147,13 +7144,6 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg
RemoveAurasDueToSpell(50240);
break;
}
// Warrior - Vigilance, SPELLFAMILY_GENERIC
if (auraSpellInfo->Id == 50720)
{
target = triggeredByAura->GetCaster();
if (!target)
return false;
}
}
break;
case SPELLFAMILY_MAGE:

4
src/server/scripts/Commands/cs_modify.cpp
View File

@@ -1022,7 +1022,7 @@ public:
else
{
uint32 moneyToAddMsg = moneyToAdd * -1;
if (newmoney > MAX_MONEY_AMOUNT)
if (newmoney > int64(MAX_MONEY_AMOUNT))
newmoney = MAX_MONEY_AMOUNT;
handler->PSendSysMessage(LANG_YOU_TAKE_MONEY, moneyToAddMsg, handler->GetNameLink(target).c_str());
@@ -1037,7 +1037,7 @@ public:
if (handler->needReportToTarget(target))
ChatHandler(target->GetSession()).PSendSysMessage(LANG_YOURS_MONEY_GIVEN, handler->GetNameLink().c_str(), uint32(moneyToAdd));
if (moneyToAdd >= MAX_MONEY_AMOUNT)
if (moneyToAdd >= int64(MAX_MONEY_AMOUNT))
moneyToAdd = MAX_MONEY_AMOUNT;
if (targetMoney >= uint64(MAX_MONEY_AMOUNT) - moneyToAdd)