From cc83cac0aad3cff6389805e27f789af447dfb807 Mon Sep 17 00:00:00 2001 From: AlexDereka Date: Wed, 22 Apr 2009 17:00:43 +0400 Subject: [PATCH] [7696] Fixed compile warnings --- src/game/Level3.cpp | 2 +- src/game/Object.h | 2 +- src/game/Player.h | 2 +- src/game/Unit.cpp | 30 +++++++++++++++--------------- src/shared/revision_nr.h | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 72dbeafc1..8ffdb3fc1 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -3440,7 +3440,7 @@ bool ChatHandler::HandleModifyArenaCommand(const char * args) bool ChatHandler::HandleReviveCommand(const char* args) { Player* player = NULL; - uint32 player_guid = 0; + uint64 player_guid = 0; if (*args) { diff --git a/src/game/Object.h b/src/game/Object.h index 6cc6d267c..fc01e3a42 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -187,7 +187,7 @@ class MANGOS_DLL_SPEC Object return *(((uint8*)&m_uint32Values[ index ])+offset); } - uint8 GetUInt16Value( uint16 index, uint8 offset) const + uint16 GetUInt16Value( uint16 index, uint8 offset) const { ASSERT( index < m_valuesCount || PrintIndexError( index , false) ); ASSERT( offset < 2 ); diff --git a/src/game/Player.h b/src/game/Player.h index d704b1b0e..cd2980724 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -1794,7 +1794,7 @@ class MANGOS_DLL_SPEC Player : public Unit for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) if (m_bgBattleGroundQueueID[i].bgQueueTypeId == bgQueueTypeId) return m_bgBattleGroundQueueID[i].invitedToInstance != 0; - return PLAYER_MAX_BATTLEGROUND_QUEUES; + return false; } bool InBattleGroundQueueForBattleGroundQueueType(BattleGroundQueueTypeId bgQueueTypeId) const { diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index dbf482bbb..cb81054b9 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1290,8 +1290,8 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da damageInfo->procEx|=PROC_EX_NORMAL_HIT; float reducePercent = 1.0f; //damage factor // calculate base values and mods - float baseLowEnd = 1.3; - float baseHighEnd = 1.2; + float baseLowEnd = 1.3f; + float baseHighEnd = 1.2f; switch(getClass()) // lowering base values for casters { case CLASS_SHAMAN: @@ -1299,17 +1299,17 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da case CLASS_MAGE: case CLASS_WARLOCK: case CLASS_DRUID: - baseLowEnd -= 0.7; - baseHighEnd -= 0.3; + baseLowEnd -= 0.7f; + baseHighEnd -= 0.3f; break; } - float maxLowEnd = 0.6; + float maxLowEnd = 0.6f; switch(getClass()) // upper for melee classes { case CLASS_WARRIOR: case CLASS_ROGUE: - maxLowEnd = 0.91; //If the attacker is a melee class then instead the lower value of 0.91 + maxLowEnd = 0.91f; //If the attacker is a melee class then instead the lower value of 0.91 } // calculate values @@ -1405,29 +1405,29 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss) // Reduce attack time if (pVictim->haveOffhandWeapon() && offtime < basetime) { - float percent20 = pVictim->GetAttackTime(OFF_ATTACK) * 0.20; - float percent60 = 3 * percent20; + float percent20 = pVictim->GetAttackTime(OFF_ATTACK) * 0.20f; + float percent60 = 3.0f * percent20; if(offtime > percent20 && offtime <= percent60) { pVictim->setAttackTimer(OFF_ATTACK, uint32(percent20)); } else if(offtime > percent60) { - offtime -= 2 * percent20; + offtime -= 2.0f * percent20; pVictim->setAttackTimer(OFF_ATTACK, uint32(offtime)); } } else { float percent20 = pVictim->GetAttackTime(BASE_ATTACK) * 0.20; - float percent60 = 3 * percent20; + float percent60 = 3.0f * percent20; if(basetime > percent20 && basetime <= percent60) { pVictim->setAttackTimer(BASE_ATTACK, uint32(percent20)); } else if(basetime > percent60) { - basetime -= 2 * percent20; + basetime -= 2.0f * percent20; pVictim->setAttackTimer(BASE_ATTACK, uint32(basetime)); } } @@ -1443,19 +1443,19 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss) { // -probability is between 0% and 40% // 20% base chance - float Probability = 20; + float Probability = 20.0f; //there is a newbie protection, at level 10 just 7% base chance; assuming linear function if( pVictim->getLevel() < 30 ) - Probability = 0.65f*pVictim->getLevel()+0.5; + Probability = 0.65f*pVictim->getLevel()+0.5f; uint32 VictimDefense=pVictim->GetDefenseSkillValue(); uint32 AttackerMeleeSkill=GetUnitMeleeSkill(); Probability *= AttackerMeleeSkill/(float)VictimDefense; - if(Probability > 40) - Probability = 40; + if(Probability > 40.0f) + Probability = 40.0f; if(roll_chance_f(Probability)) CastSpell(pVictim, 1604, true); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 1b89a6972..ad5fcf157 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7695" + #define REVISION_NR "7696" #endif // __REVISION_NR_H__