summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-11-15 15:02:17 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-11-15 15:02:17 +0100
commit635386faad0f9ed6ce3ea2b83484e6ce3ffba937 (patch)
tree0334f19aff07ad5f13d82b0ec98bc4e05baea79c
parentAdded an assert for unknown protocol, so that the function isn't missed when upgrading to a new protocol. (diff)
downloadcuberite-635386faad0f9ed6ce3ea2b83484e6ce3ffba937.tar
cuberite-635386faad0f9ed6ce3ea2b83484e6ce3ffba937.tar.gz
cuberite-635386faad0f9ed6ce3ea2b83484e6ce3ffba937.tar.bz2
cuberite-635386faad0f9ed6ce3ea2b83484e6ce3ffba937.tar.lz
cuberite-635386faad0f9ed6ce3ea2b83484e6ce3ffba937.tar.xz
cuberite-635386faad0f9ed6ce3ea2b83484e6ce3ffba937.tar.zst
cuberite-635386faad0f9ed6ce3ea2b83484e6ce3ffba937.zip
Diffstat (limited to '')
-rw-r--r--source/Generating/BioGen.cpp4
-rw-r--r--source/Generating/HeiGen.cpp4
-rw-r--r--source/OSSupport/Socket.cpp3
3 files changed, 5 insertions, 6 deletions
diff --git a/source/Generating/BioGen.cpp b/source/Generating/BioGen.cpp
index a43d995df..d12bdcf52 100644
--- a/source/Generating/BioGen.cpp
+++ b/source/Generating/BioGen.cpp
@@ -51,8 +51,8 @@ cBioGenCache::cBioGenCache(cBiomeGen * a_BioGenToCache, int a_CacheSize) :
cBioGenCache::~cBioGenCache()
{
- delete m_CacheData;
- delete m_CacheOrder;
+ delete[] m_CacheData;
+ delete[] m_CacheOrder;
delete m_BioGenToCache;
}
diff --git a/source/Generating/HeiGen.cpp b/source/Generating/HeiGen.cpp
index ed353751c..0fe0ea74f 100644
--- a/source/Generating/HeiGen.cpp
+++ b/source/Generating/HeiGen.cpp
@@ -51,8 +51,8 @@ cHeiGenCache::cHeiGenCache(cTerrainHeightGen * a_HeiGenToCache, int a_CacheSize)
cHeiGenCache::~cHeiGenCache()
{
- delete m_CacheData;
- delete m_CacheOrder;
+ delete[] m_CacheData;
+ delete[] m_CacheOrder;
delete m_HeiGenToCache;
}
diff --git a/source/OSSupport/Socket.cpp b/source/OSSupport/Socket.cpp
index 8d6a5ee94..d44a343e0 100644
--- a/source/OSSupport/Socket.cpp
+++ b/source/OSSupport/Socket.cpp
@@ -239,10 +239,9 @@ cSocket cSocket::Accept()
cSocket SClient = accept(m_Socket, (sockaddr*)&from, &fromlen);
- if (from.sin_addr.s_addr && SClient.IsValid()) // Get IP in string form
+ if (SClient.IsValid() && (from.sin_addr.s_addr != 0)) // Get IP in string form
{
SClient.m_IPString = inet_ntoa(from.sin_addr);
- //LOG("cSocket::Accept() %s", SClient.m_IPString);
}
return SClient;