edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make /rescue work in deepfreeze

Browse source 
Thanks to NANAMAR for report
This commit is contained in:
def 2020-05-27 23:22:05 +02:00
parent ec6e6f99b6
commit 3cbd75b840
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/server/entities/character.cpp
View file

@ -2356,7 +2356,7 @@ void CCharacter::DDRaceInit()
void CCharacter::Rescue()
{
if (m_SetSavePos && !m_Super && !m_DeepFreeze && IsGrounded() && m_Pos == m_PrevPos) {
if (m_SetSavePos && !m_Super && IsGrounded() && m_Pos == m_PrevPos) {
if (m_LastRescue + g_Config.m_SvRescueDelay * Server()->TickSpeed() > Server()->Tick())
{
char aBuf[256];
@ -2366,7 +2366,7 @@ void CCharacter::Rescue()
}
int index = GameServer()->Collision()->GetPureMapIndex(m_Pos);
if (GameServer()->Collision()->GetTileIndex(index) == TILE_FREEZE || GameServer()->Collision()->GetFTileIndex(index) == TILE_FREEZE) {
if (m_DeepFreeze || GameServer()->Collision()->GetTileIndex(index) == TILE_FREEZE || GameServer()->Collision()->GetFTileIndex(index) == TILE_FREEZE) {
m_LastRescue = Server()->Tick();
m_Core.m_Pos = m_PrevSavePos;
m_Pos = m_PrevSavePos;
@ -2377,6 +2377,7 @@ void CCharacter::Rescue()
m_Core.m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
m_Core.m_HookPos = m_Core.m_Pos;
m_DeepFreeze = false;
UnFreeze();
}
}