mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-19 13:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9101] Correct target mode 48, and rename to something more meaningful

Browse source 
Also adjust target 49/50 angles to be really left/right.

Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-01-02 14:50:07 +01:00
parent b9fd5f4311
commit 1ec90288fb
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/SharedDefines.h
View file

@ -1067,7 +1067,7 @@ enum Targets
TARGET_CHAIN_HEAL = 45, TARGET_CHAIN_HEAL = 45,
TARGET_SCRIPT_COORDINATES = 46, TARGET_SCRIPT_COORDINATES = 46,
TARGET_DYNAMIC_OBJECT_FRONT = 47, TARGET_DYNAMIC_OBJECT_FRONT = 47,
TARGET_SUMMON = 48, TARGET_DYNAMIC_OBJECT_BEHIND = 48,
TARGET_DYNAMIC_OBJECT_LEFT_SIDE = 49, TARGET_DYNAMIC_OBJECT_LEFT_SIDE = 49,
TARGET_DYNAMIC_OBJECT_RIGHT_SIDE = 50, TARGET_DYNAMIC_OBJECT_RIGHT_SIDE = 50,
TARGET_AREAEFFECT_CUSTOM_2 = 52, TARGET_AREAEFFECT_CUSTOM_2 = 52,

12
src/game/Spell.cpp
View file

@ -1417,7 +1417,6 @@ void Spell::SetTargetMap(uint32 effIndex, uint32 targetMode, UnitList& targetUni
case TARGET_SELF2: case TARGET_SELF2:
case TARGET_AREAEFFECT_CUSTOM: case TARGET_AREAEFFECT_CUSTOM:
case TARGET_AREAEFFECT_CUSTOM_2: case TARGET_AREAEFFECT_CUSTOM_2:
case TARGET_SUMMON:
targetUnitMap.push_back(m_caster); targetUnitMap.push_back(m_caster);
break; break;
case TARGET_RANDOM_ENEMY_CHAIN_IN_AREA: case TARGET_RANDOM_ENEMY_CHAIN_IN_AREA:
@ -2122,16 +2121,19 @@ void Spell::SetTargetMap(uint32 effIndex, uint32 targetMode, UnitList& targetUni
break; break;
case TARGET_DYNAMIC_OBJECT_FRONT: case TARGET_DYNAMIC_OBJECT_FRONT:
case TARGET_DYNAMIC_OBJECT_BEHIND:
case TARGET_DYNAMIC_OBJECT_LEFT_SIDE: case TARGET_DYNAMIC_OBJECT_LEFT_SIDE:
case TARGET_DYNAMIC_OBJECT_RIGHT_SIDE: case TARGET_DYNAMIC_OBJECT_RIGHT_SIDE:
{
if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)) if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
{ {
float angle = m_caster->GetOrientation(); float angle = m_caster->GetOrientation();
switch(targetMode) switch(targetMode)
{ {
case TARGET_DYNAMIC_OBJECT_FRONT: break; case TARGET_DYNAMIC_OBJECT_FRONT: break;
case TARGET_DYNAMIC_OBJECT_LEFT_SIDE: angle -= 3*M_PI/4; break; case TARGET_DYNAMIC_OBJECT_BEHIND: angle += M_PI; break;
case TARGET_DYNAMIC_OBJECT_RIGHT_SIDE: angle += 3*M_PI/4; break; case TARGET_DYNAMIC_OBJECT_LEFT_SIDE: angle += M_PI/2; break;
case TARGET_DYNAMIC_OBJECT_RIGHT_SIDE: angle -= M_PI/2; break;
} }
float x,y; float x,y;
@ -2141,7 +2143,7 @@ void Spell::SetTargetMap(uint32 effIndex, uint32 targetMode, UnitList& targetUni
targetUnitMap.push_back(m_caster); targetUnitMap.push_back(m_caster);
break; break;
}
case TARGET_POINT_AT_NORTH: case TARGET_POINT_AT_NORTH:
case TARGET_POINT_AT_SOUTH: case TARGET_POINT_AT_SOUTH:
case TARGET_POINT_AT_EAST: case TARGET_POINT_AT_EAST:

1
src/game/SpellMgr.h
View file

@ -243,7 +243,6 @@ inline bool IsCasterSourceTarget(uint32 target)
case TARGET_TOTEM_WATER: case TARGET_TOTEM_WATER:
case TARGET_TOTEM_AIR: case TARGET_TOTEM_AIR:
case TARGET_TOTEM_FIRE: case TARGET_TOTEM_FIRE:
case TARGET_SUMMON:
case TARGET_AREAEFFECT_CUSTOM_2: case TARGET_AREAEFFECT_CUSTOM_2:
case TARGET_ALL_RAID_AROUND_CASTER: case TARGET_ALL_RAID_AROUND_CASTER:
case TARGET_SELF2: case TARGET_SELF2:

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9100" #define REVISION_NR "9101"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__