diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/BattleGround.h | 4 | ||||
| -rw-r--r-- | src/game/Player.cpp | 3 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h index 4e1c2a197c0..bc3af58041e 100644 --- a/src/game/BattleGround.h +++ b/src/game/BattleGround.h @@ -213,9 +213,9 @@ enum BattleGroundWinner enum BattleGroundTeamId { BG_TEAM_ALLIANCE = 0, - BG_TEAM_HORDE = 1, - BG_TEAMS_COUNT = 2 + BG_TEAM_HORDE = 1 }; +#define BG_TEAMS_COUNT 2 enum BattleGroundJoinError { diff --git a/src/game/Player.cpp b/src/game/Player.cpp index a5466edebd8..01ec1a62b00 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -15985,8 +15985,7 @@ void Player::SaveToDB() uint32 tmp_displayid = GetDisplayId(); // Set player sit state to standing on save, also stealth and shifted form - SetStandState(UNIT_STAND_STATE_STAND); // stand state - RemoveStandFlags(UNIT_STAND_FLAGS_ALL); // stand flags? + SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_STAND); SetByteValue(UNIT_FIELD_BYTES_2, 3, 0); // shapeshift RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); SetDisplayId(GetNativeDisplayId()); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index eb685b899f9..84addee51b6 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7337" + #define REVISION_NR "7340" #endif // __REVISION_NR_H__ |