mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 04:37:00 +00:00
[10963] Rename UNIT_STAND_STATE_SUBMERGED to more generic *_CUSTOM
Visual appearance depend on model animation capability. In addition, change stand state for creature at enter combat when creature has custom stand state. Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
parent
b206e5ddd0
commit
514a66fd67
3 changed files with 6 additions and 2 deletions
|
|
@ -7719,6 +7719,10 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
|
|||
// should probably be removed for the attacked (+ it's party/group) only, not global
|
||||
RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
|
||||
// client does not handle this state on it's own (reset to default at LoadCreatureAddon)
|
||||
if (getStandState() == UNIT_STAND_STATE_CUSTOM)
|
||||
SetStandState(UNIT_STAND_STATE_STAND);
|
||||
|
||||
if (((Creature*)this)->AI())
|
||||
((Creature*)this)->AI()->EnterCombat(enemy);
|
||||
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ enum UnitStandStateType
|
|||
UNIT_STAND_STATE_SIT_HIGH_CHAIR = 6,
|
||||
UNIT_STAND_STATE_DEAD = 7,
|
||||
UNIT_STAND_STATE_KNEEL = 8,
|
||||
UNIT_STAND_STATE_SUBMERGED = 9
|
||||
UNIT_STAND_STATE_CUSTOM = 9 // Depends on model animation. Submerge, freeze, hide, hibernate, rest
|
||||
};
|
||||
|
||||
// byte flags value (UNIT_FIELD_BYTES_1,2)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "10962"
|
||||
#define REVISION_NR "10963"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue