diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 543b45ef5..1576bda95 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -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;