mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 09:34:19 +00:00
There is a variable for that, use it! :p
This commit is contained in:
parent
04981004d5
commit
7b8575f755
|
@ -1386,27 +1386,27 @@ void CCharacter::HandleTiles(int Index)
|
|||
m_Hit |= DISABLE_HIT_RIFLE;
|
||||
}
|
||||
int z = GameServer()->Collision()->IsTeleport(MapIndex);
|
||||
if(z && ((CGameControllerDDRace*)GameServer()->m_pController)->m_TeleOuts[z-1].size())
|
||||
if(z && Controller->m_TeleOuts[z-1].size())
|
||||
{
|
||||
m_Core.m_HookedPlayer = -1;
|
||||
m_Core.m_HookState = HOOK_RETRACTED;
|
||||
m_Core.m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
|
||||
m_Core.m_HookState = HOOK_RETRACTED;
|
||||
int Num = (((CGameControllerDDRace*)GameServer()->m_pController)->m_TeleOuts[z-1].size());
|
||||
m_Core.m_Pos = ((CGameControllerDDRace*)GameServer()->m_pController)->m_TeleOuts[z-1][(!Num)?Num:rand() % Num];
|
||||
int Num = Controller->m_TeleOuts[z-1].size();
|
||||
m_Core.m_Pos = Controller->m_TeleOuts[z-1][(!Num)?Num:rand() % Num];
|
||||
m_Core.m_HookPos = m_Core.m_Pos;
|
||||
return;
|
||||
}
|
||||
int evilz = GameServer()->Collision()->IsEvilTeleport(MapIndex);
|
||||
if(evilz && !m_Super && ((CGameControllerDDRace*)GameServer()->m_pController)->m_TeleOuts[evilz-1].size())
|
||||
if(evilz && !m_Super && Controller->m_TeleOuts[evilz-1].size())
|
||||
{
|
||||
m_Core.m_HookedPlayer = -1;
|
||||
m_Core.m_HookState = HOOK_RETRACTED;
|
||||
m_Core.m_TriggeredEvents |= COREEVENT_HOOK_RETRACT;
|
||||
m_Core.m_HookState = HOOK_RETRACTED;
|
||||
GameWorld()->ReleaseHooked(GetPlayer()->GetCID());
|
||||
int Num = (((CGameControllerDDRace*)GameServer()->m_pController)->m_TeleOuts[evilz-1].size());
|
||||
m_Core.m_Pos = ((CGameControllerDDRace*)GameServer()->m_pController)->m_TeleOuts[evilz-1][(!Num)?Num:rand() % Num];
|
||||
int Num = Controller->m_TeleOuts[evilz-1].size();
|
||||
m_Core.m_Pos = Controller->m_TeleOuts[evilz-1][(!Num)?Num:rand() % Num];
|
||||
m_Core.m_HookPos = m_Core.m_Pos;
|
||||
m_Core.m_Vel = vec2(0,0);
|
||||
return;
|
||||
|
|
Loading…
Reference in a new issue