diff options
| author | Machiavelli <none@none> | 2009-06-11 17:56:20 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-11 17:56:20 +0200 |
| commit | 1c97b2bf796fb367b77e653556220e69cf7b5878 (patch) | |
| tree | ffaa612c7502785edc750a664ebc2253c41e4f5c /src/game/SharedDefines.h | |
| parent | 6eaf6e962a31aa308406289d538aef30a56b95cb (diff) | |
| parent | 6c069aa5b8405d51202781104daf5c6e8642b891 (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/SharedDefines.h')
| -rw-r--r-- | src/game/SharedDefines.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 3234fc28baa..0ab69789660 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -694,7 +694,10 @@ enum SpellEffects SPELL_EFFECT_CREATE_ITEM_2 = 157, SPELL_EFFECT_MILLING = 158, SPELL_EFFECT_ALLOW_RENAME_PET = 159, - TOTAL_SPELL_EFFECTS = 160 + SPELL_EFFECT_160 = 160, + SPELL_EFFECT_161 = 161, + SPELL_EFFECT_162 = 162, + TOTAL_SPELL_EFFECTS = 163 }; enum SpellCastResult @@ -1054,7 +1057,7 @@ enum Targets 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_RAID_CASTER = 56, + TARGET_UNIT_RAID_CASTER = 56, TARGET_UNIT_TARGET_RAID = 57, TARGET_UNIT_NEARBY_RAID = 58, TARGET_UNIT_CONE_ALLY = 59, @@ -1157,7 +1160,7 @@ enum GameobjectTypes GAMEOBJECT_TYPE_FISHINGNODE = 17, GAMEOBJECT_TYPE_SUMMONING_RITUAL = 18, GAMEOBJECT_TYPE_MAILBOX = 19, - GAMEOBJECT_TYPE_AUCTIONHOUSE = 20, + GAMEOBJECT_TYPE_DO_NOT_USE = 20, GAMEOBJECT_TYPE_GUARDPOST = 21, GAMEOBJECT_TYPE_SPELLCASTER = 22, GAMEOBJECT_TYPE_MEETINGSTONE = 23, @@ -1165,7 +1168,7 @@ enum GameobjectTypes GAMEOBJECT_TYPE_FISHINGHOLE = 25, GAMEOBJECT_TYPE_FLAGDROP = 26, GAMEOBJECT_TYPE_MINI_GAME = 27, - GAMEOBJECT_TYPE_LOTTERY_KIOSK = 28, + GAMEOBJECT_TYPE_DO_NOT_USE_2 = 28, GAMEOBJECT_TYPE_CAPTURE_POINT = 29, GAMEOBJECT_TYPE_AURA_GENERATOR = 30, GAMEOBJECT_TYPE_DUNGEON_DIFFICULTY = 31, |