diff options
| author | kelno <kelno@users.noreply.github.com> | 2017-06-08 18:07:01 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2020-07-16 22:00:28 +0200 |
| commit | e576ddbb82d65715ca93c96c332792f4c6a44303 (patch) | |
| tree | 69165f230b654069ebea1fedccf0af0df114744d | |
| parent | e300d395627ae11041ed38831c50a68a319b5eef (diff) | |
Core/Misc: Fix typo in UNDERWARER_INDARKWATER (#19864)
(cherry picked from commit f5fd0b5ef329bd464e797abc1a1b25be72b1ba40)
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 12 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index f771d1ee0bb..21e37b2b624 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -891,7 +891,7 @@ void Player::HandleDrowning(uint32 time_diff) } // In dark water - if (m_MirrorTimerFlags & UNDERWARER_INDARKWATER) + if (m_MirrorTimerFlags & UNDERWATER_INDARKWATER) { // Fatigue timer not activated - activate it if (m_MirrorTimer[FATIGUE_TIMER] == DISABLED_MIRROR_TIMER) @@ -914,7 +914,7 @@ void Player::HandleDrowning(uint32 time_diff) else if (HasPlayerFlag(PLAYER_FLAGS_GHOST)) // Teleport ghost to graveyard RepopAtGraveyard(); } - else if (!(m_MirrorTimerFlagsLast & UNDERWARER_INDARKWATER)) + else if (!(m_MirrorTimerFlagsLast & UNDERWATER_INDARKWATER)) SendMirrorTimer(FATIGUE_TIMER, getMaxTimer(FATIGUE_TIMER), m_MirrorTimer[FATIGUE_TIMER], -1); } } @@ -924,7 +924,7 @@ void Player::HandleDrowning(uint32 time_diff) m_MirrorTimer[FATIGUE_TIMER]+=10*time_diff; if (m_MirrorTimer[FATIGUE_TIMER] >= DarkWaterTime || !IsAlive()) StopMirrorTimer(FATIGUE_TIMER); - else if (m_MirrorTimerFlagsLast & UNDERWARER_INDARKWATER) + else if (m_MirrorTimerFlagsLast & UNDERWATER_INDARKWATER) SendMirrorTimer(FATIGUE_TIMER, DarkWaterTime, m_MirrorTimer[FATIGUE_TIMER], 10); } @@ -25687,9 +25687,9 @@ void Player::ProcessTerrainStatusUpdate(ZLiquidStatus status, Optional<LiquidDat // Fatigue bar state (if not on flight path or transport) if ((liquidData->type_flags & MAP_LIQUID_TYPE_DARK_WATER) && !IsInFlight() && !GetTransport()) - m_MirrorTimerFlags |= UNDERWARER_INDARKWATER; + m_MirrorTimerFlags |= UNDERWATER_INDARKWATER; else - m_MirrorTimerFlags &= ~UNDERWARER_INDARKWATER; + m_MirrorTimerFlags &= ~UNDERWATER_INDARKWATER; // Lava state (any contact) if (liquidData->type_flags & MAP_LIQUID_TYPE_MAGMA) @@ -25710,7 +25710,7 @@ void Player::ProcessTerrainStatusUpdate(ZLiquidStatus status, Optional<LiquidDat } } else - m_MirrorTimerFlags &= ~(UNDERWATER_INWATER | UNDERWATER_INLAVA | UNDERWATER_INSLIME | UNDERWARER_INDARKWATER); + m_MirrorTimerFlags &= ~(UNDERWATER_INWATER | UNDERWATER_INLAVA | UNDERWATER_INSLIME | UNDERWATER_INDARKWATER); } void Player::SetCanParry(bool value) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 71093b2497b..8516fb71611 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -143,7 +143,7 @@ enum PlayerUnderwaterState UNDERWATER_INWATER = 0x01, // terrain type is water and player is afflicted by it UNDERWATER_INLAVA = 0x02, // terrain type is lava and player is afflicted by it UNDERWATER_INSLIME = 0x04, // terrain type is lava and player is afflicted by it - UNDERWARER_INDARKWATER = 0x08, // terrain type is dark water and player is afflicted by it + UNDERWATER_INDARKWATER = 0x08, // terrain type is dark water and player is afflicted by it UNDERWATER_EXIST_TIMERS = 0x10 }; |