From 79226352afcf4343839e0105cfe8d63f357defa8 Mon Sep 17 00:00:00 2001
From: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
Date: Sun, 14 Nov 2010 11:04:13 +0200
Subject: [PATCH] revert teleport useless change

---
 src/game/server/entities/character.cpp | 12 ++++++------
 src/game/server/entities/character.h   |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index bee7db834..5d96a70a8 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -1104,27 +1104,27 @@ void CCharacter::HandleTiles(int Index)
 	}
 	m_LastBooster = MapIndex;
 	int z = GameServer()->Collision()->IsTeleport(MapIndex);
-	if(z && DDRace()->m_TeleOuts[z-1].size())
+	if(z && ((CGameControllerDDRace*)GameServer()->m_pController)->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 = (DDRace()->m_TeleOuts[z-1].size());
-		m_Core.m_Pos = DDRace()->m_TeleOuts[z-1][(!Num)?Num:rand() % Num];
+		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];
 		m_Core.m_HookPos = m_Core.m_Pos;
 		return;
 	}
 	int evilz = GameServer()->Collision()->IsEvilTeleport(MapIndex);
-	if(evilz && !m_Super && DDRace()->m_TeleOuts[evilz-1].size())
+	if(evilz && !m_Super && ((CGameControllerDDRace*)GameServer()->m_pController)->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 = (DDRace()->m_TeleOuts[evilz-1].size());
-		m_Core.m_Pos = DDRace()->m_TeleOuts[evilz-1][(!Num)?Num:rand() % Num];
+		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];
 		m_Core.m_HookPos = m_Core.m_Pos;
 		m_Core.m_Vel = vec2(0,0);
 		return;
diff --git a/src/game/server/entities/character.h b/src/game/server/entities/character.h
index 9c35ac7dc..5614fb1ff 100644
--- a/src/game/server/entities/character.h
+++ b/src/game/server/entities/character.h
@@ -29,7 +29,6 @@ class CCharacter : public CEntity
 	void HandleTiles(int Index);
 	float m_Time;
 	int m_LastBroadcast;
-	class CGameControllerDDRace* m_pDDRace;
 public:
 	//character's size
 	static const int ms_PhysSize = 28;
@@ -82,7 +81,6 @@ public:
 	
 	bool IsAlive() const { return m_Alive; }
 	class CPlayer *GetPlayer() { return m_pPlayer; }
-	class CGameControllerDDRace *DDRace() { return m_pDDRace; }
 		// the player core for the physics	
 	CCharacterCore m_Core;
 	struct WeaponStat