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

Make evil (red) teleports work as normal (blue) teleports when weapons- or hook-through-teleport are activated

Browse source
This commit is contained in:
def 2013-07-22 17:37:14 +02:00
parent d4c0f31b32
commit 3a80c5f5fb
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1440,16 +1440,19 @@ void CCharacter::HandleTiles(int Index)
} }
int evilz = GameServer()->Collision()->IsEvilTeleport(MapIndex); int evilz = GameServer()->Collision()->IsEvilTeleport(MapIndex);
if(evilz && !m_Super && Controller->m_TeleOuts[evilz-1].size()) if(evilz && !m_Super && Controller->m_TeleOuts[evilz-1].size())
{
if (!g_Config.m_SvTeleportHook && !g_Config.m_SvTeleportWeapons)
{ {
m_Core.m_HookedPlayer = -1; m_Core.m_HookedPlayer = -1;
m_Core.m_HookState = HOOK_RETRACTED; m_Core.m_HookState = HOOK_RETRACTED;
m_Core.m_TriggeredEvents |= COREEVENT_HOOK_RETRACT; m_Core.m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
m_Core.m_HookState = HOOK_RETRACTED; m_Core.m_HookState = HOOK_RETRACTED;
GameWorld()->ReleaseHooked(GetPlayer()->GetCID()); GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
m_Core.m_Vel = vec2(0,0);
}
int Num = Controller->m_TeleOuts[evilz-1].size(); int Num = Controller->m_TeleOuts[evilz-1].size();
m_Core.m_Pos = Controller->m_TeleOuts[evilz-1][(!Num)?Num:rand() % Num]; m_Core.m_Pos = Controller->m_TeleOuts[evilz-1][(!Num)?Num:rand() % Num];
m_Core.m_HookPos = m_Core.m_Pos; m_Core.m_HookPos = m_Core.m_Pos;
m_Core.m_Vel = vec2(0,0);
return; return;
} }
if(GameServer()->Collision()->IsCheckTeleport(MapIndex)) if(GameServer()->Collision()->IsCheckTeleport(MapIndex))