mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9643] Typo in UNDERWATER_INDARKWATER.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
XTZGZoReX 2010-03-30 19:08:20 +04:00 • committed by VladimirMangos
parent fd5ec0008d
commit bf1903345b
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/Player.cpp
View file

@ -971,7 +971,7 @@ void Player::HandleDrowning(uint32 time_diff)
} }
// In dark water // In dark water
if (m_MirrorTimerFlags & UNDERWARER_INDARKWATER) if (m_MirrorTimerFlags & UNDERWATER_INDARKWATER)
{ {
// Fatigue timer not activated - activate it // Fatigue timer not activated - activate it
if (m_MirrorTimer[FATIGUE_TIMER] == DISABLED_MIRROR_TIMER) if (m_MirrorTimer[FATIGUE_TIMER] == DISABLED_MIRROR_TIMER)
@ -994,7 +994,7 @@ void Player::HandleDrowning(uint32 time_diff)
else if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) // Teleport ghost to graveyard else if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) // Teleport ghost to graveyard
RepopAtGraveyard(); RepopAtGraveyard();
} }
else if (!(m_MirrorTimerFlagsLast & UNDERWARER_INDARKWATER)) else if (!(m_MirrorTimerFlagsLast & UNDERWATER_INDARKWATER))
SendMirrorTimer(FATIGUE_TIMER, getMaxTimer(FATIGUE_TIMER), m_MirrorTimer[FATIGUE_TIMER], -1); SendMirrorTimer(FATIGUE_TIMER, getMaxTimer(FATIGUE_TIMER), m_MirrorTimer[FATIGUE_TIMER], -1);
} }
} }
@ -1004,7 +1004,7 @@ void Player::HandleDrowning(uint32 time_diff)
m_MirrorTimer[FATIGUE_TIMER]+=10*time_diff; m_MirrorTimer[FATIGUE_TIMER]+=10*time_diff;
if (m_MirrorTimer[FATIGUE_TIMER] >= DarkWaterTime || !isAlive()) if (m_MirrorTimer[FATIGUE_TIMER] >= DarkWaterTime || !isAlive())
StopMirrorTimer(FATIGUE_TIMER); StopMirrorTimer(FATIGUE_TIMER);
else if (m_MirrorTimerFlagsLast & UNDERWARER_INDARKWATER) else if (m_MirrorTimerFlagsLast & UNDERWATER_INDARKWATER)
SendMirrorTimer(FATIGUE_TIMER, DarkWaterTime, m_MirrorTimer[FATIGUE_TIMER], 10); SendMirrorTimer(FATIGUE_TIMER, DarkWaterTime, m_MirrorTimer[FATIGUE_TIMER], 10);
} }
@ -20095,7 +20095,7 @@ void Player::UpdateUnderwaterState( Map* m, float x, float y, float z )
ZLiquidStatus res = m->getLiquidStatus(x, y, z, MAP_ALL_LIQUIDS, &liquid_status); ZLiquidStatus res = m->getLiquidStatus(x, y, z, MAP_ALL_LIQUIDS, &liquid_status);
if (!res) if (!res)
{ {
m_MirrorTimerFlags &= ~(UNDERWATER_INWATER|UNDERWATER_INLAVA|UNDERWATER_INSLIME|UNDERWARER_INDARKWATER); m_MirrorTimerFlags &= ~(UNDERWATER_INWATER|UNDERWATER_INLAVA|UNDERWATER_INSLIME|UNDERWATER_INDARKWATER);
// Small hack for enable breath in WMO // Small hack for enable breath in WMO
if (IsInWater()) if (IsInWater())
m_MirrorTimerFlags|=UNDERWATER_INWATER; m_MirrorTimerFlags|=UNDERWATER_INWATER;
@ -20113,9 +20113,9 @@ void Player::UpdateUnderwaterState( Map* m, float x, float y, float z )
// Allow travel in dark water on taxi or transport // Allow travel in dark water on taxi or transport
if ((liquid_status.type & MAP_LIQUID_TYPE_DARK_WATER) && !isInFlight() && !GetTransport()) if ((liquid_status.type & MAP_LIQUID_TYPE_DARK_WATER) && !isInFlight() && !GetTransport())
m_MirrorTimerFlags |= UNDERWARER_INDARKWATER; m_MirrorTimerFlags |= UNDERWATER_INDARKWATER;
else else
m_MirrorTimerFlags &= ~UNDERWARER_INDARKWATER; m_MirrorTimerFlags &= ~UNDERWATER_INDARKWATER;
// in lava check, anywhere in lava level // in lava check, anywhere in lava level
if (liquid_status.type&MAP_LIQUID_TYPE_MAGMA) if (liquid_status.type&MAP_LIQUID_TYPE_MAGMA)

2
src/game/Player.h
View file

@ -75,7 +75,7 @@ enum PlayerUnderwaterState
UNDERWATER_INWATER = 0x01, // terrain type is water and player is afflicted by it 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_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 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 UNDERWATER_EXIST_TIMERS = 0x10
}; };

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9642" #define REVISION_NR "9643"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__