summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-19 18:45:32 +0200
committerMattes D <github@xoft.cz>2014-10-19 18:45:42 +0200
commitcf73fee7e362134dc4caabc7c99f3a5bb0593a99 (patch)
tree871252d73bb6187cc4bfc95abdbfbe7fccd55bd5
parentTwoLevel BioGen: fixed swapped inside and outside biomes. (diff)
downloadcuberite-cf73fee7e362134dc4caabc7c99f3a5bb0593a99.tar
cuberite-cf73fee7e362134dc4caabc7c99f3a5bb0593a99.tar.gz
cuberite-cf73fee7e362134dc4caabc7c99f3a5bb0593a99.tar.bz2
cuberite-cf73fee7e362134dc4caabc7c99f3a5bb0593a99.tar.lz
cuberite-cf73fee7e362134dc4caabc7c99f3a5bb0593a99.tar.xz
cuberite-cf73fee7e362134dc4caabc7c99f3a5bb0593a99.tar.zst
cuberite-cf73fee7e362134dc4caabc7c99f3a5bb0593a99.zip
-rw-r--r--src/Bindings/LuaState.h2
-rw-r--r--src/ClientHandle.h2
-rw-r--r--src/ItemGrid.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index 779760017..899228a66 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -363,7 +363,7 @@ protected:
}
/** Variadic template recursor: More params to push. Push them and recurse. */
- template<typename T, typename... Args>
+ template <typename T, typename... Args>
inline bool PushCallPop(T a_Param, Args &&... args)
{
Push(a_Param);
diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index 9733ff32d..80cf16963 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -343,7 +343,7 @@ private:
cCriticalSection m_CSChunkLists;
cChunkCoordsList m_LoadedChunks; // Chunks that the player belongs to
cChunkCoordsList m_ChunksToSend; // Chunks that need to be sent to the player (queued because they weren't generated yet or there's not enough time to send them)
- cChunkCoordsList m_SentChunks; // Store the coordinates of the chunks that the client has loaded
+ cChunkCoordsList m_SentChunks; // Chunks that are currently sent to the client
cProtocol * m_Protocol;
diff --git a/src/ItemGrid.cpp b/src/ItemGrid.cpp
index 0bd44bb0d..1977216d8 100644
--- a/src/ItemGrid.cpp
+++ b/src/ItemGrid.cpp
@@ -642,7 +642,7 @@ void cItemGrid::GenerateRandomLootWithBooks(const cLootProbab * a_LootProbabs, s
// Choose the enchantments
cWeightedEnchantments Enchantments;
cEnchantments::AddItemEnchantmentWeights(Enchantments, E_ITEM_BOOK, 24 + Noise.IntNoise2DInt(a_Seed, TotalProbab) % 7);
- int NumEnchantments = Noise.IntNoise3DInt(TotalProbab, Rnd, a_Seed) % 5; // The number of enchantments this book wil get.
+ int NumEnchantments = Noise.IntNoise3DInt(TotalProbab, Rnd, a_Seed) % 5; // The number of enchantments this book wil get.
for (int j = 0; j <= NumEnchantments; j++)
{