From be80e08ac66dd5cfbf193830868b05eef54d749f Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 9 Jun 2017 13:25:35 +0200 Subject: [PATCH] Core/Misc: Fix typo in UNDERWARER_INDARKWATER --- src/server/game/Entities/Player/Player.cpp | 14 +++++++------- src/server/game/Entities/Player/Player.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index da8a654655..bbd1734195 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -1076,7 +1076,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) @@ -1099,7 +1099,7 @@ void Player::HandleDrowning(uint32 time_diff) else if (HasFlag(PLAYER_FLAGS, 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); } } @@ -1109,7 +1109,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); } @@ -24688,9 +24688,9 @@ void Player::ProcessTerrainStatusUpdate(ZLiquidStatus status, Optionaltype_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) @@ -24700,7 +24700,7 @@ void Player::ProcessTerrainStatusUpdate(ZLiquidStatus status, Optionaltype_flags & MAP_LIQUID_TYPE_SLIME) { @@ -24711,7 +24711,7 @@ void Player::ProcessTerrainStatusUpdate(ZLiquidStatus status, Optional