Core/Quests: Fixed remaining issues with quest crediting (note: previous commits did not introduce issues, only revealed them)

Core/DBLayer: Fixed more compile warnings
Core/Spells: Corrected code style from revision 634af79146

Closes issue #3956.

--HG--
branch : trunk

2 files changed, 21 insertions, 14 deletions

diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index ec0b12a0b42..f7e0fe56392 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -697,13 +697,13 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         case ACTION_T_KILLED_MONSTER:
             //first attempt player who tapped creature
             if (Player* pPlayer = me->GetLootRecipient())
-                pPlayer->RewardPlayerAndGroupAtEvent(action.killed_monster.creatureId, me);
+                pPlayer->RewardPlayerAndGroupAtEvent(action.killed_monster.creatureId, pPlayer);    // pPlayer as param is a hacky solution not to use GUID
             else
             {
                 //if not available, use pActionInvoker
                 if (Unit* pTarget = GetTargetByType(action.killed_monster.target, pActionInvoker))
                     if (Player* pPlayer2 = pTarget->GetCharmerOrOwnerPlayerOrPlayerItself())
-                        pPlayer2->RewardPlayerAndGroupAtEvent(action.killed_monster.creatureId, me);
+                        pPlayer2->RewardPlayerAndGroupAtEvent(action.killed_monster.creatureId, pPlayer);
             }
             break;
         case ACTION_T_SET_INST_DATA:
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 23ddd016a0c..7ba3e6b7976 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -16117,12 +16117,12 @@ void Unit::SetAuraStack(uint32 spellId, Unit *target, uint32 stack)
         aura->SetStackAmount(stack);
 }
 
-void Unit::ApplyResilience(const Unit * pVictim, float * crit, int32 * damage, bool isCrit, CombatRating type) const
+void Unit::ApplyResilience(const Unit *pVictim, float *crit, int32 *damage, bool isCrit, CombatRating type) const
 {
     if (IsVehicle() || pVictim->IsVehicle())
         return;
 
-    const Unit * source = ToPlayer();
+    const Unit *source = ToPlayer();
     if (!source)
     {
         source = ToCreature();
@@ -16134,7 +16134,7 @@ void Unit::ApplyResilience(const Unit * pVictim, float * crit, int32 * damage, b
         }
     }
 
-    const Unit * target = pVictim->ToPlayer();
+    const Unit *target = pVictim->ToPlayer();
     if (!target)
     {
         target = pVictim->ToCreature();
@@ -16145,6 +16145,7 @@ void Unit::ApplyResilience(const Unit * pVictim, float * crit, int32 * damage, b
                 target = target->ToPlayer();
         }
     }
+
     if (!target)
         return;
 
@@ -16152,29 +16153,35 @@ void Unit::ApplyResilience(const Unit * pVictim, float * crit, int32 * damage, b
     {
         case CR_CRIT_TAKEN_MELEE:
             // Crit chance reduction works against nonpets
-            if (crit) (*crit) -= target->ToPlayer()->GetMeleeCritChanceReduction();
+            if (crit)
+                *crit -= target->ToPlayer()->GetMeleeCritChanceReduction();
             if (source && damage)
             {
-                if (isCrit) (*damage) -= target->ToPlayer()->GetMeleeCritDamageReduction((*damage));
-                (*damage) -= target->ToPlayer()->GetMeleeDamageReduction((*damage));
+                if (isCrit)
+                    *damage -= target->ToPlayer()->GetMeleeCritDamageReduction(*damage);
+                *damage -= target->ToPlayer()->GetMeleeDamageReduction(*damage);
             }
             break;
         case CR_CRIT_TAKEN_RANGED:
             // Crit chance reduction works against nonpets
-            if (crit) (*crit) -= target->ToPlayer()->GetRangedCritChanceReduction();
+            if (crit)
+                *crit -= target->ToPlayer()->GetRangedCritChanceReduction();
             if (source && damage)
             {
-                if (isCrit) (*damage) -= target->ToPlayer()->GetRangedCritDamageReduction((*damage));
-                (*damage) -= target->ToPlayer()->GetRangedDamageReduction((*damage));
+                if (isCrit)
+                    *damage -= target->ToPlayer()->GetRangedCritDamageReduction(*damage);
+                *damage -= target->ToPlayer()->GetRangedDamageReduction(*damage);
             }
             break;
         case CR_CRIT_TAKEN_SPELL:
             // Crit chance reduction works against nonpets
-            if (crit) (*crit) -= target->ToPlayer()->GetSpellCritChanceReduction();
+            if (crit)
+                *crit -= target->ToPlayer()->GetSpellCritChanceReduction();
             if (source && damage)
             {
-                if (isCrit) (*damage) -= target->ToPlayer()->GetSpellCritDamageReduction((*damage));
-                (*damage) -= target->ToPlayer()->GetSpellDamageReduction((*damage));
+                if (isCrit)
+                    *damage -= target->ToPlayer()->GetSpellCritDamageReduction(*damage);
+                *damage -= target->ToPlayer()->GetSpellDamageReduction(*damage);
             }
             break;
         default: