Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Object/Updates/UpdateFields.h src/server/game/Entities/Unit/Unit.cpp src/server/scripts/Spells/spell_druid.cpp
This commit is contained in:
commit
6568b0624d
566 files changed
+29934
-14984
No files matched your search
@@ -486,8 +486,9 @@ enum SMART_ACTION
|
||||
SMART_ACTION_GO_SET_LOOT_STATE = 99, // state
|
||||
SMART_ACTION_SEND_TARGET_TO_TARGET = 100, // id
|
||||
SMART_ACTION_SET_HOME_POS = 101, // none
|
||||
SMART_ACTION_SET_HEALTH_REGEN = 102, // 0/1
|
||||
|
||||
SMART_ACTION_END = 102
|
||||
SMART_ACTION_END = 103
|
||||
};
|
||||
|
||||
struct SmartAction
|
||||
@@ -913,6 +914,11 @@ struct SmartAction
|
||||
uint32 angle;
|
||||
} setRangedMovement;
|
||||
|
||||
struct
|
||||
{
|
||||
uint32 regenHealth;
|
||||
} setHealthRegen;
|
||||
|
||||
//! Note for any new future actions
|
||||
//! All parameters must have type uint32
|
||||
|
||||
|
||||
Reference in new issue
Block a user