diff options
| author | oy <Tom_Adams@web.de> | 2011-05-05 01:43:27 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-05-05 01:43:27 +0200 |
| commit | 5fbf6d0bfd32ab520c6cf67a330c9a2240882750 (patch) | |
| tree | f016fcc0fdb475049be27ac0bf96efccc03de47e /src/engine/shared | |
| parent | 41ebc9bc9d9bdda650799a6c9dc9a5ed15a55430 (diff) | |
| download | zcatch-5fbf6d0bfd32ab520c6cf67a330c9a2240882750.tar.gz zcatch-5fbf6d0bfd32ab520c6cf67a330c9a2240882750.zip | |
fixed compiler warnings. Closes #679
Diffstat (limited to 'src/engine/shared')
| -rw-r--r-- | src/engine/shared/datafile.cpp | 4 | ||||
| -rw-r--r-- | src/engine/shared/network_server.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/engine/shared/datafile.cpp b/src/engine/shared/datafile.cpp index 3a5a4b1d..00410038 100644 --- a/src/engine/shared/datafile.cpp +++ b/src/engine/shared/datafile.cpp @@ -273,7 +273,9 @@ void *CDataFileReader::GetDataImpl(int Index, int Swap) { // fetch the data size int DataSize = GetDataSize(Index); +#if defined(CONF_ARCH_ENDIAN_BIG) int SwapSize = DataSize; +#endif if(m_pDataFile->m_Header.m_Version == 4) { @@ -292,7 +294,9 @@ void *CDataFileReader::GetDataImpl(int Index, int Swap) // decompress the data, TODO: check for errors s = UncompressedSize; uncompress((Bytef*)m_pDataFile->m_ppDataPtrs[Index], &s, (Bytef*)pTemp, DataSize); // ignore_convention +#if defined(CONF_ARCH_ENDIAN_BIG) SwapSize = s; +#endif // clean up the temporary buffers mem_free(pTemp); diff --git a/src/engine/shared/network_server.cpp b/src/engine/shared/network_server.cpp index 3078ab9f..f3fbfa32 100644 --- a/src/engine/shared/network_server.cpp +++ b/src/engine/shared/network_server.cpp @@ -79,9 +79,9 @@ int CNetServer::Close() int CNetServer::Drop(int ClientID, const char *pReason) { // TODO: insert lots of checks here - NETADDR Addr = ClientAddr(ClientID); + /*NETADDR Addr = ClientAddr(ClientID); - /*dbg_msg("net_server", "client dropped. cid=%d ip=%d.%d.%d.%d reason=\"%s\"", + dbg_msg("net_server", "client dropped. cid=%d ip=%d.%d.%d.%d reason=\"%s\"", ClientID, Addr.ip[0], Addr.ip[1], Addr.ip[2], Addr.ip[3], pReason |