From e0affc3f3446b8f4d17003caabe3a71f7ad059b8 Mon Sep 17 00:00:00 2001
From: Alexander Akulich <akulichalexander@gmail.com>
Date: Wed, 13 Jan 2021 02:25:26 +0300
Subject: [PATCH] CCharacterCore: Join Init() methods

---
 src/game/gamecore.cpp | 11 -----------
 src/game/gamecore.h   |  3 +--
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp
index a90126f2f..20d773946 100644
--- a/src/game/gamecore.cpp
+++ b/src/game/gamecore.cpp
@@ -56,17 +56,6 @@ float VelocityRamp(float Value, float Start, float Range, float Curvature)
 	return 1.0f / powf(Curvature, (Value - Start) / Range);
 }
 
-void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams)
-{
-	m_pWorld = pWorld;
-	m_pCollision = pCollision;
-	m_pTeleOuts = NULL;
-
-	m_pTeams = pTeams;
-	m_Id = -1;
-	Reset();
-}
-
 void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams, std::map<int, std::vector<vec2>> *pTeleOuts)
 {
 	m_pWorld = pWorld;
diff --git a/src/game/gamecore.h b/src/game/gamecore.h
index 66aadb22b..f78102879 100644
--- a/src/game/gamecore.h
+++ b/src/game/gamecore.h
@@ -226,8 +226,7 @@ public:
 
 	int m_TriggeredEvents;
 
-	void Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams);
-	void Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams, std::map<int, std::vector<vec2>> *pTeleOuts);
+	void Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore *pTeams = nullptr, std::map<int, std::vector<vec2>> *pTeleOuts = nullptr);
 	void Reset();
 	void Tick(bool UseInput);
 	void Move();