diff options
| author | oy <Tom_Adams@web.de> | 2016-06-13 09:27:09 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2016-06-13 09:27:09 +0200 |
| commit | 52053d003d21f395573d430250a56f8f7410625d (patch) | |
| tree | a821ed2b009e90d9a245c9209c98fcc71dda2f04 | |
| parent | 4ba1af2186878dad8cc02d040d98f8e060943218 (diff) | |
fixed some warnings
| -rw-r--r-- | bam.lua | 2 | ||||
| -rw-r--r-- | datasrc/datatypes.py | 2 | ||||
| -rw-r--r-- | src/engine/client/client.cpp | 2 | ||||
| -rw-r--r-- | src/mastersrv/mastersrv.cpp | 2 | ||||
| -rw-r--r-- | src/tools/crapnet.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -144,7 +144,7 @@ function build(settings) settings.cc.Output = Intermediate_Output if config.compiler.driver == "cl" then - settings.cc.flags:Add("/wd4244") + settings.cc.flags:Add("/wd4244", "/wd4577") else settings.cc.flags:Add("-Wall", "-fno-exceptions") if family == "windows" then diff --git a/datasrc/datatypes.py b/datasrc/datatypes.py index 5441e3783..f4ab825a0 100644 --- a/datasrc/datatypes.py +++ b/datasrc/datatypes.py @@ -147,7 +147,7 @@ class Float(BaseType): def Set(self, value): self.value = value def EmitDefinition(self, name): - return ["%f"%self.value] + return ["%ff"%self.value] #return ["%d /* %s */"%(self.value, self._target_name)] class String(BaseType): diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index 2bf3d489d..c5e147594 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -935,7 +935,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))) diff --git a/src/mastersrv/mastersrv.cpp b/src/mastersrv/mastersrv.cpp index 1098123b4..eee30501b 100644 --- a/src/mastersrv/mastersrv.cpp +++ b/src/mastersrv/mastersrv.cpp @@ -117,7 +117,7 @@ void BuildPackets() } else { - 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 }; 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]; diff --git a/src/tools/crapnet.cpp b/src/tools/crapnet.cpp index 95a4d1563..9979d0028 100644 --- a/src/tools/crapnet.cpp +++ b/src/tools/crapnet.cpp @@ -42,7 +42,7 @@ static int m_ConfigInterval = 10; // seconds between different pingconfigs static int m_ConfigLog = 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}; NETSOCKET Socket = net_udp_create(Src, 0); |