diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-29 01:56:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-29 01:56:44 +0200 |
| commit | 08e2b03b28ff07499da75a6ee630f0dd559d60e4 (patch) | |
| tree | 639e87e2cdb08651ad81d053562b7e7d5907fe4d /src | |
| parent | f4f09e3eb58db73ebec62062131f2ec613a5118a (diff) | |
Core: Fix warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 10 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_modify.cpp | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index d3d188151df..5d0c56d8d01 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -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: diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 9a96544af89..df2aad375d9 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -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) |