summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-03-10 19:34:20 +0100
committerTycho <work.tycho+git@gmail.com>2014-03-10 19:34:20 +0100
commit2eca30aebc9a4f7307c31a75ca23e19fa3f1a4a7 (patch)
treef5726673e266e7db616d0c8d90b836761dafb9ce /src
parentUse string.reserve to avoid the need to do inplace byteswap (diff)
downloadcuberite-2eca30aebc9a4f7307c31a75ca23e19fa3f1a4a7.tar
cuberite-2eca30aebc9a4f7307c31a75ca23e19fa3f1a4a7.tar.gz
cuberite-2eca30aebc9a4f7307c31a75ca23e19fa3f1a4a7.tar.bz2
cuberite-2eca30aebc9a4f7307c31a75ca23e19fa3f1a4a7.tar.lz
cuberite-2eca30aebc9a4f7307c31a75ca23e19fa3f1a4a7.tar.xz
cuberite-2eca30aebc9a4f7307c31a75ca23e19fa3f1a4a7.tar.zst
cuberite-2eca30aebc9a4f7307c31a75ca23e19fa3f1a4a7.zip
Diffstat (limited to 'src')
-rw-r--r--src/ClientHandle.cpp13
-rw-r--r--src/LightingThread.cpp6
-rw-r--r--src/WorldStorage/WSSAnvil.cpp4
3 files changed, 2 insertions, 21 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 94c9f5f71..df728e83b 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -36,19 +36,6 @@
-
-
-#define AddPistonDir(x, y, z, dir, amount) switch (dir) { case 0: (y)-=(amount); break; case 1: (y)+=(amount); break;\
- case 2: (z)-=(amount); break; case 3: (z)+=(amount); break;\
- case 4: (x)-=(amount); break; case 5: (x)+=(amount); break; }
-
-
-
-
-
-/** If the number of queued outgoing packets reaches this, the client will be kicked */
-#define MAX_OUTGOING_PACKETS 2000
-
/** Maximum number of explosions to send this tick, server will start dropping if exceeded */
#define MAX_EXPLOSIONS_PER_TICK 20
diff --git a/src/LightingThread.cpp b/src/LightingThread.cpp
index 44dadb8a9..302473d71 100644
--- a/src/LightingThread.cpp
+++ b/src/LightingThread.cpp
@@ -13,12 +13,6 @@
-/// If more than this many chunks are in the queue, a warning is printed to the log
-#define WARN_ON_QUEUE_SIZE 800
-
-
-
-
/// Chunk data callback that takes the chunk data and puts them into cLightingThread's m_BlockTypes[] / m_HeightMap[]:
class cReader :
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index eb159f28d..070738164 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -507,10 +507,10 @@ cChunkDef::BiomeMap * cWSSAnvil::LoadBiomeMapFromNBT(cChunkDef::BiomeMap * a_Bio
// The biomes stored don't match in size
return NULL;
}
- const int * BiomeData = (const int *)(a_NBT.GetData(a_TagIdx));
+ const char * BiomeData = (a_NBT.GetData(a_TagIdx));
for (size_t i = 0; i < ARRAYCOUNT(*a_BiomeMap); i++)
{
- (*a_BiomeMap)[i] = (EMCSBiome)(ntohl(BiomeData[i]));
+ (*a_BiomeMap)[i] = (EMCSBiome)(GetBEInt(&BiomeData[i * 4]));
if ((*a_BiomeMap)[i] == 0xff)
{
// Unassigned biomes