Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Carbenium committed 2015-07-22 01:46:01 +02:00
1 parent 82ea8da720
commit ba5c1753a9
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Conditions/ConditionMgr.h
+2 -2
View File
@@ -74,8 +74,8 @@ enum ConditionTypes
CONDITION_HP_PCT = 38, // hpPct ComparisonType 0 true if unit's hp matches given pct
CONDITION_TERRAIN_SWAP = 39, // terrainSwap 0 0 true if object is in terrainswap
CONDITION_REALM_ACHIEVEMENT = 40, // achievement_id 0 0 true if realm achievement is complete
CONDITION_IN_WATER = 40, // 0 0 0 true if unit in water
CONDITION_MAX = 41 // MAX
CONDITION_IN_WATER = 41, // 0 0 0 true if unit in water
CONDITION_MAX = 42 // MAX
};
/*! Documentation on implementing a new ConditionSourceType: