mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 01:24:18 +00:00
CCharacterCore: Join Init() methods
This commit is contained in:
parent
33dc79d190
commit
e0affc3f34
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue