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

Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64

Browse source
This commit is contained in:
def 2014-12-31 14:49:44 +01:00
parent b3581f6dba bd62b5da79
commit 592ab36c7e
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/client/text.cpp
View file

@ -299,7 +299,7 @@ class CTextRender : public IEngineTextRender
int SlotSize = SlotW*SlotH; int SlotSize = SlotW*SlotH;
int x = 1; int x = 1;
int y = 1; int y = 1;
int px, py; unsigned int px, py;
FT_Set_Pixel_Sizes(pFont->m_FtFace, 0, pSizeData->m_FontSize); FT_Set_Pixel_Sizes(pFont->m_FtFace, 0, pSizeData->m_FontSize);
@ -340,8 +340,8 @@ class CTextRender : public IEngineTextRender
} }
} }
if(0) for(py = 0; py < SlotW; py++) if(0) for(py = 0; (int)py < SlotW; py++)
for(px = 0; px < SlotH; px++) for(px = 0; (int)px < SlotH; px++)
ms_aGlyphData[py*SlotW+px] = 255; ms_aGlyphData[py*SlotW+px] = 255;
// upload the glyph // upload the glyph

2
src/mastersrv/mastersrv.cpp
View file

@ -117,7 +117,7 @@ void BuildPackets()
} }
else else
{ {
static char IPV4Mapping[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF }; static char IPV4Mapping[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (char)0xFF, (char)0xFF };
mem_copy(m_aPackets[m_NumPackets-1].m_Data.m_aServers[PacketIndex].m_aIp, IPV4Mapping, sizeof(IPV4Mapping)); mem_copy(m_aPackets[m_NumPackets-1].m_Data.m_aServers[PacketIndex].m_aIp, IPV4Mapping, sizeof(IPV4Mapping));
m_aPackets[m_NumPackets-1].m_Data.m_aServers[PacketIndex].m_aIp[12] = pCurrent->m_Address.ip[0]; m_aPackets[m_NumPackets-1].m_Data.m_aServers[PacketIndex].m_aIp[12] = pCurrent->m_Address.ip[0];

2
src/tools/crapnet.cpp
View file

@ -42,7 +42,7 @@ static int m_ConfigInterval = 10; // seconds between different pingconfigs
static int m_ConfigLog = 0; static int m_ConfigLog = 0;
static int m_ConfigReorder = 0; static int m_ConfigReorder = 0;
void Run(int Port, NETADDR Dest) void Run(unsigned short Port, NETADDR Dest)
{ {
NETADDR Src = {NETTYPE_IPV4, {0,0,0,0}, Port}; NETADDR Src = {NETTYPE_IPV4, {0,0,0,0}, Port};
NETSOCKET Socket = net_udp_create(Src); NETSOCKET Socket = net_udp_create(Src);