edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make client compile

Browse source
This commit is contained in:
def 2013-07-22 17:20:34 +02:00
parent 66776503c4
commit d4c0f31b32
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/client/client.cpp
View file

@ -944,7 +944,7 @@ void CClient::ProcessConnlessPacket(CNetChunk *pPacket)
{
NETADDR Addr;
static char IPV4Mapping[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };
static unsigned char IPV4Mapping[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };
// copy address
if(!mem_comp(IPV4Mapping, pAddrs[i].m_aIp, sizeof(IPV4Mapping)))

9
src/game/gamecore.cpp
View file

@ -57,6 +57,15 @@ 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_pTeams = pTeams;
m_Id = -1;
}
void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore* pTeams, std::map<int, std::vector<vec2> > pTeleOuts)
{
m_pWorld = pWorld;

1
src/game/gamecore.h
View file

@ -207,6 +207,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 Reset();
void Tick(bool UseInput);