Merge branch 'master' into 4.3.4
Conflicts: dep/libmpq/CMakeLists.txt src/server/game/Battlefield/BattlefieldMgr.cpp src/server/game/Battlefield/BattlefieldMgr.h src/server/game/DataStores/DBCStores.cpp src/server/game/Entities/Creature/Creature.cpp src/server/game/Entities/Creature/Creature.h src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/StatSystem.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Vehicle/Vehicle.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Handlers/BattlefieldHandler.cpp src/server/game/Handlers/GuildHandler.cpp src/server/game/Movement/Spline/MoveSplineInit.cpp src/server/game/Server/Protocol/Opcodes.cpp src/server/game/Server/WorldSession.h src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp src/server/scripts/EasternKingdoms/ZulAman/zulaman.h src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h src/server/scripts/EasternKingdoms/boss_kruul.cpp src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp src/server/scripts/Kalimdor/zone_azshara.cpp src/server/scripts/Kalimdor/zone_moonglade.cpp src/server/scripts/Kalimdor/zone_orgrimmar.cpp src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.h src/server/scripts/Spells/spell_dk.cpp src/tools/map_extractor/mpq_libmpq.cpp src/tools/map_extractor/mpq_libmpq04.h src/tools/vmap4_extractor/loadlib/loadlib.h src/tools/vmap4_extractor/mpq_libmpq.cpp src/tools/vmap4_extractor/mpq_libmpq04.h
This commit is contained in:
commit
08003577de
1318 files changed
+2645
-2328
No files matched your search
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
|
||||
* Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
|
||||
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
@@ -367,10 +367,10 @@ void Unit::Update(uint32 p_time)
|
||||
|
||||
bool Unit::haveOffhandWeapon() const
|
||||
{
|
||||
if (GetTypeId() == TYPEID_PLAYER)
|
||||
return ToPlayer()->GetWeaponForAttack(OFF_ATTACK, true);
|
||||
else
|
||||
return m_canDualWield;
|
||||
if (Player const* player = ToPlayer())
|
||||
return player->GetWeaponForAttack(OFF_ATTACK, true);
|
||||
|
||||
return CanDualWield();
|
||||
}
|
||||
|
||||
void Unit::MonsterMoveWithSpeed(float x, float y, float z, float speed, bool generatePath, bool forceDestination)
|
||||
@@ -399,11 +399,12 @@ void Unit::UpdateSplineMovement(uint32 t_diff)
|
||||
|
||||
void Unit::UpdateSplinePosition()
|
||||
{
|
||||
uint32 const positionUpdateDelay = 400;
|
||||
static uint32 const positionUpdateDelay = 400;
|
||||
|
||||
m_movesplineTimer.Reset(positionUpdateDelay);
|
||||
Movement::Location loc = movespline->ComputePosition();
|
||||
if (GetTransGUID())
|
||||
|
||||
if (movespline->onTransport)
|
||||
{
|
||||
Position& pos = m_movementInfo.transport.pos;
|
||||
pos.m_positionX = loc.x;
|
||||
@@ -2050,41 +2051,39 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit* victim, WeaponAttackT
|
||||
|
||||
uint32 Unit::CalculateDamage(WeaponAttackType attType, bool normalized, bool addTotalPct)
|
||||
{
|
||||
float min_damage, max_damage;
|
||||
float minDamage = 0.0f;
|
||||
float maxDamage = 0.0f;
|
||||
|
||||
if (GetTypeId() == TYPEID_PLAYER && (normalized || !addTotalPct))
|
||||
ToPlayer()->CalculateMinMaxDamage(attType, normalized, addTotalPct, min_damage, max_damage);
|
||||
if (normalized || !addTotalPct)
|
||||
CalculateMinMaxDamage(attType, normalized, addTotalPct, minDamage, maxDamage);
|
||||
else
|
||||
{
|
||||
switch (attType)
|
||||
{
|
||||
case RANGED_ATTACK:
|
||||
min_damage = GetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE);
|
||||
max_damage = GetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE);
|
||||
minDamage = GetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE);
|
||||
maxDamage = GetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE);
|
||||
break;
|
||||
case BASE_ATTACK:
|
||||
min_damage = GetFloatValue(UNIT_FIELD_MINDAMAGE);
|
||||
max_damage = GetFloatValue(UNIT_FIELD_MAXDAMAGE);
|
||||
minDamage = GetFloatValue(UNIT_FIELD_MINDAMAGE);
|
||||
maxDamage = GetFloatValue(UNIT_FIELD_MAXDAMAGE);
|
||||
break;
|
||||
case OFF_ATTACK:
|
||||
min_damage = GetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE);
|
||||
max_damage = GetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE);
|
||||
minDamage = GetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE);
|
||||
maxDamage = GetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE);
|
||||
break;
|
||||
// Just for good manner
|
||||
default:
|
||||
min_damage = 0.0f;
|
||||
max_damage = 0.0f;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (min_damage > max_damage)
|
||||
std::swap(min_damage, max_damage);
|
||||
if (minDamage > maxDamage)
|
||||
std::swap(minDamage, maxDamage);
|
||||
|
||||
if (max_damage == 0.0f)
|
||||
max_damage = 5.0f;
|
||||
if (maxDamage == 0.0f)
|
||||
maxDamage = 5.0f;
|
||||
|
||||
return urand((uint32)min_damage, (uint32)max_damage);
|
||||
return urand(uint32(minDamage), uint32(maxDamage));
|
||||
}
|
||||
|
||||
float Unit::CalculateLevelPenalty(SpellInfo const* spellProto) const
|
||||
@@ -13828,7 +13827,7 @@ void Unit::SetStunned(bool apply)
|
||||
|
||||
// Creature specific
|
||||
if (GetTypeId() != TYPEID_PLAYER)
|
||||
ToCreature()->StopMoving();
|
||||
StopMoving();
|
||||
else
|
||||
SetStandState(UNIT_STAND_STATE_STAND);
|
||||
|
||||
|
||||
Reference in new issue
Block a user