Revert "Core/Spells: Fix a crash on checking school immunity added to unit manually (not by aura)"

This reverts commit 07badd7385.
This commit is contained in:
QAston
2011-07-28 23:44:39 +02:00
parent 07badd7385
commit 495ead5f7f
9 changed files with 168 additions and 485 deletions
+35 -34
View File
@@ -1287,64 +1287,65 @@ enum Targets
TARGET_UNIT_TARGET_ENEMY = 6,
TARGET_UNIT_AREA_ENTRY_SRC = 7,
TARGET_UNIT_AREA_ENTRY_DST = 8,
TARGET_DEST_HOME = 9,
TARGET_UNIT_TARGET_CASTER_SRC = 11, // teleport target to caster
TARGET_DST_HOME = 9,
TARGET_UNIT_TARGET_DEST_CASTER = 11, // teleport target to caster
TARGET_UNIT_AREA_ENEMY_SRC = 15,
TARGET_UNIT_AREA_ENEMY_DST = 16,
TARGET_DEST_DB = 17,
TARGET_DEST_CASTER = 18,
TARGET_UNIT_AREA_PARTY = 20,
TARGET_DST_DB = 17,
TARGET_DST_CASTER = 18,
TARGET_UNIT_PARTY_CASTER = 20,
TARGET_UNIT_TARGET_ALLY = 21,
TARGET_SRC_CASTER = 22,
TARGET_GAMEOBJECT_TARGET = 23,
TARGET_UNIT_CONE_ENEMY_24 = 24,
TARGET_GAMEOBJECT = 23,
TARGET_UNIT_CONE_ENEMY = 24,
TARGET_UNIT_TARGET_ANY = 25,
TARGET_GAMEOBJECT_ITEM_TARGET = 26,
TARGET_GAMEOBJECT_ITEM = 26,
TARGET_UNIT_MASTER = 27,
TARGET_DEST_DYNOBJ_ENEMY = 28,
TARGET_DEST_DYNOBJ_ALLY = 29,
TARGET_UNIT_AREA_ALLY_SRC = 30,
TARGET_UNIT_AREA_ALLY_DST = 31,
TARGET_DEST_CASTER_SUMMON = 32, // front left, 1y from caster
TARGET_MINION = 32,
//TARGET_DEST_SUMMON
TARGET_UNIT_AREA_PARTY_SRC = 33,
TARGET_UNIT_AREA_PARTY_DST = 34,
TARGET_UNIT_TARGET_PARTY = 35,
TARGET_DEST_CASTER_UNKNOWN_36 = 36, // possibly some nearby entry dest
TARGET_UNIT_TARGET_AREA_PARTY = 37, // targets all units in party of selected target
TARGET_DEST_CASTER_RANDOM_UNKNOWN = 36, //unknown
TARGET_UNIT_TARGET_ALLY_PARTY = 37,
TARGET_UNIT_NEARBY_ENTRY = 38,
TARGET_DEST_CASTER_FISHING = 39,
TARGET_UNIT_CASTER_FISHING = 39,
TARGET_GAMEOBJECT_NEARBY_ENTRY = 40,
TARGET_DEST_CASTER_FRONT_RIGHT = 41,
TARGET_DEST_CASTER_BACK_RIGHT = 42,
TARGET_DEST_CASTER_BACK_LEFT = 43,
TARGET_DEST_CASTER_FRONT_LEFT = 44,
TARGET_UNIT_TARGET_RAID_OR_PARTY = 45,
TARGET_DEST_NEARBY_ENTRY = 46,
TARGET_DEST_CASTER_FRONT_LEFT = 41,
TARGET_DEST_CASTER_BACK_LEFT = 42,
TARGET_DEST_CASTER_BACK_RIGHT = 43,
TARGET_DEST_CASTER_FRONT_RIGHT = 44,
TARGET_UNIT_CHAINHEAL = 45,
TARGET_DST_NEARBY_ENTRY = 46,
TARGET_DEST_CASTER_FRONT = 47,
TARGET_DEST_CASTER_BACK = 48,
TARGET_DEST_CASTER_RIGHT = 49,
TARGET_DEST_CASTER_LEFT = 50,
TARGET_GAMEOBJECT_AREA_SRC = 51,
TARGET_GAMEOBJECT_AREA_DST = 52,
TARGET_DEST_TARGET_ENEMY = 53,
TARGET_UNIT_CONE_ENEMY_54 = 54,
TARGET_DST_TARGET_ENEMY = 53, // set unit coordinates as dest, only 16 target B imlemented
TARGET_UNIT_CONE_ENEMY_UNKNOWN = 54, // 180 degree, or different angle
TARGET_DEST_CASTER_FRONT_LEAP = 55, // for a leap spell
TARGET_UNIT_AREA_RAID = 56,
TARGET_UNIT_RAID_CASTER = 56,
TARGET_UNIT_TARGET_RAID = 57,
TARGET_UNIT_NEARBY_RAID = 58,
TARGET_UNIT_CONE_ALLY = 59,
TARGET_UNIT_CONE_ENTRY = 60,
TARGET_UNIT_TARGET_RAID_AREA_CLASS = 61, // targets all units in raid which have class of selected target
TARGET_UNIT_TARGET_CLASS_RAID = 61,
TARGET_TEST = 62, // for a test spell
TARGET_DEST_TARGET_ANY = 63,
TARGET_DEST_TARGET_FRONT = 64,
TARGET_DEST_TARGET_BACK = 65,
TARGET_DEST_TARGET_RIGHT = 66,
TARGET_DEST_TARGET_LEFT = 67,
TARGET_DEST_TARGET_FRONT_RIGHT = 68,
TARGET_DEST_TARGET_BACK_RIGHT = 69,
TARGET_DEST_TARGET_BACK_LEFT = 70,
TARGET_DEST_TARGET_FRONT_LEFT = 71,
TARGET_DEST_TARGET_FRONT_LEFT = 68,
TARGET_DEST_TARGET_BACK_LEFT = 69,
TARGET_DEST_TARGET_BACK_RIGHT = 70,
TARGET_DEST_TARGET_FRONT_RIGHT = 71,
TARGET_DEST_CASTER_RANDOM = 72,
TARGET_DEST_CASTER_RADIUS = 73,
TARGET_DEST_TARGET_RANDOM = 74,
@@ -1355,10 +1356,10 @@ enum Targets
TARGET_DEST_DEST_BACK = 79,
TARGET_DEST_DEST_RIGHT = 80,
TARGET_DEST_DEST_LEFT = 81,
TARGET_DEST_DEST_FRONT_RIGHT = 82,
TARGET_DEST_DEST_BACK_RIGHT = 83,
TARGET_DEST_DEST_BACK_LEFT = 84,
TARGET_DEST_DEST_FRONT_LEFT = 85,
TARGET_DEST_DEST_FRONT_LEFT = 82,
TARGET_DEST_DEST_BACK_LEFT = 83,
TARGET_DEST_DEST_BACK_RIGHT = 84,
TARGET_DEST_DEST_FRONT_RIGHT = 85,
TARGET_DEST_DEST_RANDOM = 86,
TARGET_DEST_DEST = 87,
TARGET_DEST_DYNOBJ_NONE = 88,
@@ -1366,7 +1367,7 @@ enum Targets
TARGET_UNIT_TARGET_MINIPET = 90,
TARGET_DEST_DEST_RANDOM_DIR_DIST = 91,
TARGET_UNIT_SUMMONER = 92,
TARGET_CORPSE_AREA_ENEMY_SRC = 93, // TODO
TARGET_CORPSE_AREA_ENEMY_PLAYER_SRC= 93, // TODO
TARGET_UNIT_VEHICLE = 94,
TARGET_UNIT_TARGET_PASSENGER = 95,
TARGET_UNIT_PASSENGER_0 = 96,
@@ -1377,12 +1378,12 @@ enum Targets
TARGET_UNIT_PASSENGER_5 = 101,
TARGET_UNIT_PASSENGER_6 = 102,
TARGET_UNIT_PASSENGER_7 = 103,
TARGET_UNIT_CONE_ENEMY_104 = 104,
TARGET_UNIT_AREA_PATH = 104,
TARGET_UNIT_UNK_105 = 105, // 1 spell
TARGET_DEST_CHANNEL_CASTER = 106,
TARGET_UNK_AREA_UNK_DST_107 = 107, // not enough info - only generic spells avalible
TARGET_GAMEOBJECT_CONE = 108,
TARGET_DEST_UNK_110 = 110,
TARGET_GAMEOBJECT_AREA_PATH = 108,
TARGET_DEST_UNK_110 = 110, // some kind of traj?
TOTAL_SPELL_TARGETS
};