diff options
author | Drahy <none@none> | 2009-02-04 22:08:23 +0100 |
---|---|---|
committer | Drahy <none@none> | 2009-02-04 22:08:23 +0100 |
commit | 674477ddf8678d81d116df88b33160fa6be303cb (patch) | |
tree | 8dd3bac5ab94ee39d7b72588ce8fef231c70ddb0 /src/game/SharedDefines.h | |
parent | 5d4d9530556eb66940775f12c3cc5f3c115447ca (diff) | |
parent | c745eba4a1d122b4184b27a982674c86ff193c23 (diff) |
* Huge merge with original branch
--HG--
branch : trunk
Diffstat (limited to 'src/game/SharedDefines.h')
-rw-r--r-- | src/game/SharedDefines.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 5a9c7202656..9553592c82c 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -685,7 +685,7 @@ enum SpellEffects SPELL_EFFECT_153 = 153, SPELL_EFFECT_154 = 154, SPELL_EFFECT_TITAN_GRIP = 155, - SPELL_EFFECT_ADD_SOCKET = 156, + SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC = 156, SPELL_EFFECT_CREATE_ITEM_2 = 157, SPELL_EFFECT_MILLING = 158, SPELL_EFFECT_ALLOW_RENAME_PET = 159, @@ -829,7 +829,7 @@ enum Targets TARGET_TABLE_X_Y_Z_COORDINATES = 17, // uses in teleport spells and some other //TARGET_DEST_TABLE TARGET_EFFECT_SELECT = 18, // highly depends on the spell effect - TARGET_DEST_CASTER_GROUND = 18, + TARGET_DEST_CASTER_GROUND = 18, TARGET_ALL_PARTY_AROUND_CASTER = 20, TARGET_UNIT_PARTY_CASTER = 20, TARGET_SINGLE_FRIEND = 21, @@ -891,7 +891,7 @@ enum Targets TARGET_UNIT_AREA_SCRIPT = 60, TARGET_AREAEFFECT_PARTY_AND_CLASS = 61, TARGET_UNIT_CLASS_TARGET = 61, - TARGET_TEST = 62, // for a test spell + TARGET_TEST = 62, // for a test spell TARGET_DUELVSPLAYER_COORDINATES = 63, TARGET_DEST_TARGET_ENEMY_UNKNOWN = 63, TARGET_DEST_TARGET_FRONT = 64, |