server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #40 from H0zen/develop21

Browse Source 
[Core] Clarify some issues regarding negative angles.
This commit is contained in:
Antz 2015-09-07 22:31:13 +01:00
commit d4d9cca8b2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/Object/Object.cpp
View File

@ -978,7 +978,7 @@ void WorldObject::Relocate(float x, float y, float z, float orientation)
m_position.x = x; m_position.x = x;
m_position.y = y; m_position.y = y;
m_position.z = z; m_position.z = z;
m_position.o = orientation; m_position.o = MapManager::NormalizeOrientation(orientation);
if (isType(TYPEMASK_UNIT)) if (isType(TYPEMASK_UNIT))
{ ((Unit*)this)->m_movementInfo.ChangePosition(x, y, z, orientation); } { ((Unit*)this)->m_movementInfo.ChangePosition(x, y, z, orientation); }
@ -996,7 +996,7 @@ void WorldObject::Relocate(float x, float y, float z)
void WorldObject::SetOrientation(float orientation) void WorldObject::SetOrientation(float orientation)
{ {
m_position.o = orientation; m_position.o = MapManager::NormalizeOrientation(orientation);
if (isType(TYPEMASK_UNIT)) if (isType(TYPEMASK_UNIT))
{ ((Unit*)this)->m_movementInfo.ChangeOrientation(orientation); } { ((Unit*)this)->m_movementInfo.ChangeOrientation(orientation); }

10
src/game/WorldHandlers/SpellEffects.cpp
View File

@ -2121,7 +2121,7 @@ void Spell::EffectSummon(SpellEffectIndex eff_idx)
{ {
// Summon in dest location // Summon in dest location
if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
{ spawnCreature->Relocate(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, -m_caster->GetOrientation()); } { spawnCreature->Relocate(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, m_caster->GetOrientation() + M_PI_F); }
// set timer for unsummon // set timer for unsummon
if (m_duration > 0) if (m_duration > 0)
@ -2131,10 +2131,10 @@ void Spell::EffectSummon(SpellEffectIndex eff_idx)
} }
// Summon in dest location // Summon in dest location
CreatureCreatePos pos(m_caster->GetMap(), m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, -m_caster->GetOrientation()); CreatureCreatePos pos(m_caster->GetMap(), m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, m_caster->GetOrientation() + M_PI_F);
if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)) if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
{ pos = CreatureCreatePos(m_caster, -m_caster->GetOrientation()); } { pos = CreatureCreatePos(m_caster, m_caster->GetOrientation() + M_PI_F); }
Map* map = m_caster->GetMap(); Map* map = m_caster->GetMap();
uint32 pet_number = sObjectMgr.GeneratePetNumber(); uint32 pet_number = sObjectMgr.GeneratePetNumber();
@ -2585,7 +2585,7 @@ void Spell::EffectSummonGuardian(SpellEffectIndex eff_idx)
// If dest location if present // If dest location if present
// Summon 1 unit in dest location // Summon 1 unit in dest location
CreatureCreatePos pos(m_caster->GetMap(), m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, -m_caster->GetOrientation()); CreatureCreatePos pos(m_caster->GetMap(), m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, m_caster->GetOrientation() + M_PI_F);
if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION) if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
{ {
@ -2665,7 +2665,7 @@ void Spell::EffectTeleUnitsFaceCaster(SpellEffectIndex eff_idx)
m_caster->GetClosePoint(fx, fy, fz, unitTarget->GetObjectBoundingRadius(), dis); m_caster->GetClosePoint(fx, fy, fz, unitTarget->GetObjectBoundingRadius(), dis);
} }
unitTarget->NearTeleportTo(fx, fy, fz, -m_caster->GetOrientation(), unitTarget == m_caster); unitTarget->NearTeleportTo(fx, fy, fz, m_caster->GetOrientation() + M_PI_F, unitTarget == m_caster);
} }
void Spell::EffectLearnSkill(SpellEffectIndex eff_idx) void Spell::EffectLearnSkill(SpellEffectIndex eff_idx)