summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-05-09 11:16:56 +0200
committerMattes D <github@xoft.cz>2015-05-09 12:58:55 +0200
commit846d16315a8b5a81fbc37d66da4d1254038ec494 (patch)
tree2a7c873756a3063480a64a975491bd58d9538554 /src
parentMore style checking. (diff)
downloadcuberite-846d16315a8b5a81fbc37d66da4d1254038ec494.tar
cuberite-846d16315a8b5a81fbc37d66da4d1254038ec494.tar.gz
cuberite-846d16315a8b5a81fbc37d66da4d1254038ec494.tar.bz2
cuberite-846d16315a8b5a81fbc37d66da4d1254038ec494.tar.lz
cuberite-846d16315a8b5a81fbc37d66da4d1254038ec494.tar.xz
cuberite-846d16315a8b5a81fbc37d66da4d1254038ec494.tar.zst
cuberite-846d16315a8b5a81fbc37d66da4d1254038ec494.zip
Diffstat (limited to 'src')
-rw-r--r--src/Bindings/LuaWindow.cpp6
-rw-r--r--src/Bindings/ManualBindings.cpp12
-rwxr-xr-xsrc/CheckBasicStyle.lua12
-rw-r--r--src/Chunk.cpp18
-rw-r--r--src/Chunk.h4
-rw-r--r--src/ChunkMap.cpp18
-rw-r--r--src/ChunkMap.h13
-rw-r--r--src/ChunkSender.h2
-rw-r--r--src/Enchantments.h4
-rw-r--r--src/Endianness.h2
-rw-r--r--src/Generating/Caves.cpp2
-rw-r--r--src/Inventory.cpp2
-rw-r--r--src/Inventory.h2
-rw-r--r--src/Items/ItemChest.h2
-rw-r--r--src/Items/ItemHandler.cpp2
-rw-r--r--src/Logger.h8
-rw-r--r--src/Map.cpp2
-rw-r--r--src/MobCensus.h4
-rw-r--r--src/MobProximityCounter.cpp6
-rw-r--r--src/MobProximityCounter.h14
-rw-r--r--src/MobSpawner.cpp4
-rw-r--r--src/MobSpawner.h2
-rw-r--r--src/MonsterConfig.h2
-rw-r--r--src/OSSupport/Semaphore.h2
-rw-r--r--src/Protocol/ChunkDataSerializer.cpp4
-rw-r--r--src/Root.cpp4
-rw-r--r--src/Root.h2
-rw-r--r--src/Scoreboard.cpp8
-rw-r--r--src/Scoreboard.h15
-rw-r--r--src/StringUtils.h2
-rw-r--r--src/Tracer.h5
-rw-r--r--src/UI/MinecartWithChestWindow.h2
-rw-r--r--src/WebAdmin.cpp2
-rw-r--r--src/World.cpp2
-rw-r--r--src/WorldStorage/EnchantmentSerializer.cpp4
-rw-r--r--src/WorldStorage/EnchantmentSerializer.h4
-rw-r--r--src/WorldStorage/MapSerializer.cpp4
-rw-r--r--src/WorldStorage/MapSerializer.h2
-rw-r--r--src/WorldStorage/ScoreboardSerializer.cpp6
-rw-r--r--src/WorldStorage/ScoreboardSerializer.h4
-rw-r--r--src/WorldStorage/StatSerializer.h2
-rwxr-xr-xsrc/WorldStorage/WSSAnvil.cpp2
42 files changed, 115 insertions, 104 deletions
diff --git a/src/Bindings/LuaWindow.cpp b/src/Bindings/LuaWindow.cpp
index d4014059b..5f7832ef5 100644
--- a/src/Bindings/LuaWindow.cpp
+++ b/src/Bindings/LuaWindow.cpp
@@ -159,7 +159,7 @@ void cLuaWindow::Destroy(void)
m_Plugin->Unreference(m_LuaRef);
}
- // Lua will take care of this object, it will garbage-collect it, so we *must not* delete it!
+ // Lua will take care of this object, it will garbage-collect it, so we must not delete it!
m_IsDestroyed = false;
}
@@ -167,10 +167,10 @@ void cLuaWindow::Destroy(void)
-void cLuaWindow::DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer& a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply)
+void cLuaWindow::DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply)
{
cSlotAreas Areas;
- for (auto Area : m_SlotAreas)
+ for (auto && Area : m_SlotAreas)
{
if (Area != a_ClickedArea)
{
diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index 20042a780..10f5ecb94 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -2557,8 +2557,8 @@ static int tolua_push_StringStringMap(lua_State* tolua_S, std::map< std::string,
for (std::map<std::string, std::string>::iterator it = a_StringStringMap.begin(); it != a_StringStringMap.end(); ++it)
{
- const char* key = it->first.c_str();
- const char* value = it->second.c_str();
+ const char * key = it->first.c_str();
+ const char * value = it->second.c_str();
lua_pushstring(tolua_S, key);
lua_pushstring(tolua_S, value);
lua_settable(tolua_S, top);
@@ -2573,7 +2573,7 @@ static int tolua_push_StringStringMap(lua_State* tolua_S, std::map< std::string,
static int tolua_get_HTTPRequest_Params(lua_State* tolua_S)
{
- HTTPRequest* self = (HTTPRequest*) tolua_tousertype(tolua_S, 1, nullptr);
+ HTTPRequest * self = reinterpret_cast<HTTPRequest *>(tolua_tousertype(tolua_S, 1, nullptr));
return tolua_push_StringStringMap(tolua_S, self->Params);
}
@@ -2583,7 +2583,7 @@ static int tolua_get_HTTPRequest_Params(lua_State* tolua_S)
static int tolua_get_HTTPRequest_PostParams(lua_State* tolua_S)
{
- HTTPRequest* self = (HTTPRequest*) tolua_tousertype(tolua_S, 1, nullptr);
+ HTTPRequest * self = reinterpret_cast<HTTPRequest *>(tolua_tousertype(tolua_S, 1, nullptr));
return tolua_push_StringStringMap(tolua_S, self->PostParams);
}
@@ -2593,8 +2593,8 @@ static int tolua_get_HTTPRequest_PostParams(lua_State* tolua_S)
static int tolua_get_HTTPRequest_FormData(lua_State* tolua_S)
{
- HTTPRequest* self = (HTTPRequest*) tolua_tousertype(tolua_S, 1, nullptr);
- std::map< std::string, HTTPFormData >& FormData = self->FormData;
+ HTTPRequest * self = reinterpret_cast<HTTPRequest *>(tolua_tousertype(tolua_S, 1, nullptr));
+ std::map<std::string, HTTPFormData> & FormData = self->FormData;
lua_newtable(tolua_S);
int top = lua_gettop(tolua_S);
diff --git a/src/CheckBasicStyle.lua b/src/CheckBasicStyle.lua
index 09e64b954..133446350 100755
--- a/src/CheckBasicStyle.lua
+++ b/src/CheckBasicStyle.lua
@@ -164,12 +164,20 @@ local g_ViolationPatterns =
-- Cannot check spaces around "-", because the minus is sometimes used as a hyphen between-words
-- Check spaces around "*":
- {"^[a-zA-Z0-9]+%*[a-zA-Z0-9]+", "Add space around *"},
- {"^[^\"]*[!@#$%%%^&*() %[%]\t][a-zA-Z0-9]+%*[a-zA-Z0-9]+", "Add space around *"},
+ {"^[a-zA-Z0-9]+%*[a-zA-Z0-9]+", "Add space around *"},
+ {"^[^\"]*[!@#$%%%^&*() %[%]\t][a-zA-Z0-9]+%*[a-zA-Z0-9]+", "Add space around *"},
+ {"^[a-zB-Z0-9]+%* [a-zA-Z0-9]+", "Add space before *"},
+ {"^[^\"]*[!@#$%%%^&*() %[%]\t][a-zB-Z0-9]+%* [a-zA-Z0-9]+", "Add space before *"},
-- Check spaces around "/":
{"^[a-zA-Z0-9]+%/[a-zA-Z0-9]+", "Add space around /"},
{"^[^\"]*[!@#$%%%^&*() %[%]\t][a-zA-Z0-9]+%/[a-zA-Z0-9]+", "Add space around /"},
+
+ -- Check spaces around "&":
+ {"^[a-zA-Z0-9]+%&[a-zA-Z0-9]+", "Add space around /"},
+ {"^[^\"]*[!@#$%%%^&*() %[%]\t][a-zA-Z0-9]+%&[a-zA-Z0-9]+", "Add space around /"},
+ {"^[a-zA-Z0-9]+%& [a-zA-Z0-9]+", "Add space before &"},
+ {"^[^\"]*[!@#$%%%^&*() %[%]\t][a-zA-Z0-9]+%& [a-zA-Z0-9]+", "Add space before &"},
}
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index bed5aa991..ed5a1b12a 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -472,26 +472,26 @@ void cChunk::Stay(bool a_Stay)
-void cChunk::CollectMobCensus(cMobCensus& toFill)
+void cChunk::CollectMobCensus(cMobCensus & toFill)
{
toFill.CollectSpawnableChunk(*this);
- std::list<const Vector3d*> playerPositions;
- cPlayer* currentPlayer;
- for (cClientHandleList::iterator itr = m_LoadedByClient.begin(), end = m_LoadedByClient.end(); itr != end; ++itr)
+ std::list<const Vector3d *> playerPositions;
+ cPlayer * currentPlayer;
+ for (auto itr = m_LoadedByClient.begin(), end = m_LoadedByClient.end(); itr != end; ++itr)
{
currentPlayer = (*itr)->GetPlayer();
playerPositions.push_back(&(currentPlayer->GetPosition()));
}
Vector3d currentPosition;
- for (cEntityList::iterator itr = m_Entities.begin(); itr != m_Entities.end(); ++itr)
+ for (auto itr = m_Entities.begin(); itr != m_Entities.end(); ++itr)
{
// LOGD("Counting entity #%i (%s)", (*itr)->GetUniqueID(), (*itr)->GetClass());
if ((*itr)->IsMob())
{
- cMonster& Monster = (cMonster&)(**itr);
+ auto & Monster = reinterpret_cast<cMonster &>(**itr);
currentPosition = Monster.GetPosition();
- for (std::list<const Vector3d*>::const_iterator itr2 = playerPositions.begin(); itr2 != playerPositions.end(); ++itr2)
+ for (auto itr2 = playerPositions.cbegin(); itr2 != playerPositions.cend(); ++itr2)
{
toFill.CollectMob(Monster, *this, (currentPosition - **itr2).SqrLength());
}
@@ -531,7 +531,7 @@ void cChunk::GetRandomBlockCoords(int & a_X, int & a_Y, int & a_Z)
-void cChunk::SpawnMobs(cMobSpawner& a_MobSpawner)
+void cChunk::SpawnMobs(cMobSpawner & a_MobSpawner)
{
int CenterX, CenterY, CenterZ;
GetRandomBlockCoords(CenterX, CenterY, CenterZ);
@@ -1839,7 +1839,7 @@ bool cChunk::SetSignLines(int a_PosX, int a_PosY, int a_PosZ, const AString & a_
-void cChunk::RemoveBlockEntity( cBlockEntity* a_BlockEntity)
+void cChunk::RemoveBlockEntity(cBlockEntity * a_BlockEntity)
{
MarkDirty();
m_BlockEntities.remove(a_BlockEntity);
diff --git a/src/Chunk.h b/src/Chunk.h
index 58f6ba707..f57769107 100644
--- a/src/Chunk.h
+++ b/src/Chunk.h
@@ -155,10 +155,10 @@ public:
void Stay(bool a_Stay = true);
/** Recence all mobs proximities to players in order to know what to do with them */
- void CollectMobCensus(cMobCensus& toFill);
+ void CollectMobCensus(cMobCensus & toFill);
/** Try to Spawn Monsters inside chunk */
- void SpawnMobs(cMobSpawner& a_MobSpawner);
+ void SpawnMobs(cMobSpawner & a_MobSpawner);
void Tick(std::chrono::milliseconds a_Dt);
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index edff6baf1..44acc2013 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -65,7 +65,7 @@ cChunkMap::~cChunkMap()
-void cChunkMap::RemoveLayer( cChunkLayer* a_Layer)
+void cChunkMap::RemoveLayer(cChunkLayer * a_Layer)
{
cCSLock Lock(m_CSLayers);
m_Layers.remove(a_Layer);
@@ -2716,12 +2716,12 @@ void cChunkMap::SetNextBlockTick(int a_BlockX, int a_BlockY, int a_BlockZ)
-void cChunkMap::CollectMobCensus(cMobCensus& a_ToFill)
+void cChunkMap::CollectMobCensus(cMobCensus & a_ToFill)
{
cCSLock Lock(m_CSLayers);
- for (cChunkLayerList::iterator itr = m_Layers.begin(); itr != m_Layers.end(); ++itr)
+ for (auto && layer: m_Layers)
{
- (*itr)->CollectMobCensus(a_ToFill);
+ layer->CollectMobCensus(a_ToFill);
} // for itr - m_Layers
}
@@ -2730,12 +2730,12 @@ void cChunkMap::CollectMobCensus(cMobCensus& a_ToFill)
-void cChunkMap::SpawnMobs(cMobSpawner& a_MobSpawner)
+void cChunkMap::SpawnMobs(cMobSpawner & a_MobSpawner)
{
cCSLock Lock(m_CSLayers);
- for (cChunkLayerList::iterator itr = m_Layers.begin(); itr != m_Layers.end(); ++itr)
+ for (auto && layer: m_Layers)
{
- (*itr)->SpawnMobs(a_MobSpawner);
+ layer->SpawnMobs(a_MobSpawner);
} // for itr - m_Layers
}
@@ -2936,7 +2936,7 @@ cChunk * cChunkMap::cChunkLayer::FindChunk(int a_ChunkX, int a_ChunkZ)
-void cChunkMap::cChunkLayer::CollectMobCensus(cMobCensus& a_ToFill)
+void cChunkMap::cChunkLayer::CollectMobCensus(cMobCensus & a_ToFill)
{
for (size_t i = 0; i < ARRAYCOUNT(m_Chunks); i++)
{
@@ -2955,7 +2955,7 @@ void cChunkMap::cChunkLayer::CollectMobCensus(cMobCensus& a_ToFill)
-void cChunkMap::cChunkLayer::SpawnMobs(cMobSpawner& a_MobSpawner)
+void cChunkMap::cChunkLayer::SpawnMobs(cMobSpawner & a_MobSpawner)
{
for (size_t i = 0; i < ARRAYCOUNT(m_Chunks); i++)
{
diff --git a/src/ChunkMap.h b/src/ChunkMap.h
index e9f1b94c0..35f66f339 100644
--- a/src/ChunkMap.h
+++ b/src/ChunkMap.h
@@ -64,7 +64,7 @@ public:
static const int LAYER_SIZE = 32;
- cChunkMap(cWorld* a_World);
+ cChunkMap(cWorld * a_World);
~cChunkMap();
// Broadcast respective packets to all clients of the chunk where the event is taking place
@@ -364,11 +364,11 @@ public:
/** Sets the blockticking to start at the specified block. Only one blocktick per chunk may be set, second call overwrites the first call */
void SetNextBlockTick(int a_BlockX, int a_BlockY, int a_BlockZ);
- /** Make a Mob census, of all mobs, their family, their chunk and theyr distance to closest player */
- void CollectMobCensus(cMobCensus& a_ToFill);
+ /** Make a Mob census, of all mobs, their family, their chunk and their distance to closest player */
+ void CollectMobCensus(cMobCensus & a_ToFill);
/** Try to Spawn Monsters inside all Chunks */
- void SpawnMobs(cMobSpawner& a_MobSpawner);
+ void SpawnMobs(cMobSpawner & a_MobSpawner);
void Tick(std::chrono::milliseconds a_Dt);
@@ -433,9 +433,10 @@ private:
void UnloadUnusedChunks(void);
/** Collect a mob census, of all mobs, their megatype, their chunk and their distance o closest player */
- void CollectMobCensus(cMobCensus& a_ToFill);
+ void CollectMobCensus(cMobCensus & a_ToFill);
+
/** Try to Spawn Monsters inside all Chunks */
- void SpawnMobs(cMobSpawner& a_MobSpawner);
+ void SpawnMobs(cMobSpawner & a_MobSpawner);
void Tick(std::chrono::milliseconds a_Dt);
diff --git a/src/ChunkSender.h b/src/ChunkSender.h
index 7cd7ddd86..8b187c5f9 100644
--- a/src/ChunkSender.h
+++ b/src/ChunkSender.h
@@ -13,7 +13,7 @@ And once they do, it requests the chunk data and sends it all away, either
sends to a specific client (QueueSendChunkTo)
Chunk data is queried using the cChunkDataCallback interface.
It is cached inside the ChunkSender object during the query and then processed after the query ends.
-Note that the data needs to be compressed only *after* the query finishes,
+Note that the data needs to be compressed only after the query finishes,
because the query callbacks run with ChunkMap's CS locked.
A client may remove itself from all direct requests(QueueSendChunkTo()) by calling RemoveClient();
diff --git a/src/Enchantments.h b/src/Enchantments.h
index 9c1c54ae9..9d3f342d4 100644
--- a/src/Enchantments.h
+++ b/src/Enchantments.h
@@ -138,10 +138,10 @@ public:
bool operator !=(const cEnchantments & a_Other) const;
/** Writes the enchantments into the specified NBT writer; begins with the LIST tag of the specified name ("ench" or "StoredEnchantments") */
- friend void EnchantmentSerializer::WriteToNBTCompound(cEnchantments const& a_Enchantments, cFastNBTWriter & a_Writer, const AString & a_ListTagName);
+ friend void EnchantmentSerializer::WriteToNBTCompound(const cEnchantments & a_Enchantments, cFastNBTWriter & a_Writer, const AString & a_ListTagName);
/** Reads the enchantments from the specified NBT list tag (ench or StoredEnchantments) */
- friend void EnchantmentSerializer::ParseFromNBT(cEnchantments& a_Enchantments, const cParsedNBT & a_NBT, int a_EnchListTagIdx);
+ friend void EnchantmentSerializer::ParseFromNBT(cEnchantments & a_Enchantments, const cParsedNBT & a_NBT, int a_EnchListTagIdx);
protected:
/** Maps enchantment ID -> enchantment level */
diff --git a/src/Endianness.h b/src/Endianness.h
index ed9637fcc..a415903a5 100644
--- a/src/Endianness.h
+++ b/src/Endianness.h
@@ -21,7 +21,7 @@ inline UInt64 HostToNetwork8(const void * a_Value)
-inline UInt32 HostToNetwork4(const void* a_Value)
+inline UInt32 HostToNetwork4(const void * a_Value)
{
UInt32 buf;
memcpy( &buf, a_Value, sizeof( buf));
diff --git a/src/Generating/Caves.cpp b/src/Generating/Caves.cpp
index 0a9b170fa..0a3673711 100644
--- a/src/Generating/Caves.cpp
+++ b/src/Generating/Caves.cpp
@@ -529,7 +529,7 @@ void cCaveTunnel::ProcessChunk(
/*
#ifdef _DEBUG
- // For debugging purposes, outline the shape of the cave using glowstone, *after* carving the entire cave:
+ // For debugging purposes, outline the shape of the cave using glowstone, after carving the entire cave:
for (cCaveDefPoints::const_iterator itr = m_Points.begin(), end = m_Points.end(); itr != end; ++itr)
{
int DifX = itr->m_BlockX - BlockStartX; // substitution for faster calc
diff --git a/src/Inventory.cpp b/src/Inventory.cpp
index fba6f4aea..c595da5b0 100644
--- a/src/Inventory.cpp
+++ b/src/Inventory.cpp
@@ -499,7 +499,7 @@ int cInventory::ArmorSlotNumToEntityEquipmentID(short a_ArmorSlotNum)
#if 0
-bool cInventory::AddToBar( cItem & a_Item, const int a_Offset, const int a_Size, bool* a_bChangedSlots, int a_Mode /* = 0 */)
+bool cInventory::AddToBar(cItem & a_Item, const int a_Offset, const int a_Size, bool * a_bChangedSlots, int a_Mode /* = 0 */)
{
// Fill already present stacks
if (a_Mode < 2)
diff --git a/src/Inventory.h b/src/Inventory.h
index 311f64562..b2a8f658b 100644
--- a/src/Inventory.h
+++ b/src/Inventory.h
@@ -171,7 +171,7 @@ public:
bool LoadFromJson(Json::Value & a_Value);
protected:
- bool AddToBar( cItem & a_Item, const int a_Offset, const int a_Size, bool* a_bChangedSlots, int a_Mode = 0);
+ bool AddToBar(cItem & a_Item, const int a_Offset, const int a_Size, bool * a_bChangedSlots, int a_Mode = 0);
cItemGrid m_ArmorSlots;
cItemGrid m_InventorySlots;
diff --git a/src/Items/ItemChest.h b/src/Items/ItemChest.h
index b6579c423..1d23975cd 100644
--- a/src/Items/ItemChest.h
+++ b/src/Items/ItemChest.h
@@ -78,7 +78,7 @@ public:
!BlockHandler(PlaceBlock)->DoesIgnoreBuildCollision(&a_Player, PlaceMeta)
)
{
- // Tried to place a block *into* another?
+ // Tried to place a block into another?
// Happens when you place a block aiming at side of block with a torch on it or stem beside it
return false;
}
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index 7328456b4..b7f89809e 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -362,7 +362,7 @@ bool cItemHandler::OnPlayerPlace(
!BlockHandler(PlaceBlock)->DoesIgnoreBuildCollision(&a_Player, PlaceMeta)
)
{
- // Tried to place a block *into* another?
+ // Tried to place a block into another?
// Happens when you place a block aiming at side of block with a torch on it or stem beside it
return false;
}
diff --git a/src/Logger.h b/src/Logger.h
index 5e65de8a8..176c6e810 100644
--- a/src/Logger.h
+++ b/src/Logger.h
@@ -46,10 +46,10 @@ private:
-extern void LOG(const char* a_Format, ...) FORMATSTRING(1, 2);
-extern void LOGINFO(const char* a_Format, ...) FORMATSTRING(1, 2);
-extern void LOGWARN(const char* a_Format, ...) FORMATSTRING(1, 2);
-extern void LOGERROR(const char* a_Format, ...) FORMATSTRING(1, 2);
+extern void LOG (const char * a_Format, ...) FORMATSTRING(1, 2);
+extern void LOGINFO (const char * a_Format, ...) FORMATSTRING(1, 2);
+extern void LOGWARN (const char * a_Format, ...) FORMATSTRING(1, 2);
+extern void LOGERROR(const char * a_Format, ...) FORMATSTRING(1, 2);
diff --git a/src/Map.cpp b/src/Map.cpp
index 5e57cc8ec..5f296a5b2 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -591,7 +591,7 @@ void cMap::SendTo(cClientHandle & a_Client)
for (unsigned int i = 0; i < m_Width; ++i)
{
- const Byte* Colors = &m_Data[i * m_Height];
+ const Byte * Colors = &m_Data[i * m_Height];
a_Client.SendMapColumn(m_ID, i, 0, Colors, m_Height, m_Scale);
}
diff --git a/src/MobCensus.h b/src/MobCensus.h
index e3892bec6..3dc7b2a8e 100644
--- a/src/MobCensus.h
+++ b/src/MobCensus.h
@@ -32,8 +32,8 @@ public:
// MG TODO : code the correct rule (not loaded chunk but short distant from players)
void CollectSpawnableChunk(cChunk & a_Chunk);
- /// Collect a mob - it's distance to player, it's family ...
- void CollectMob(cMonster& a_Monster, cChunk& a_Chunk, double a_Distance);
+ /// Collect a mob - its distance to player, its family ...
+ void CollectMob(cMonster & a_Monster, cChunk & a_Chunk, double a_Distance);
/// Returns true if the family is capped (i.e. there are more mobs of this family than max)
bool IsCapped(cMonster::eFamily a_MobFamily);
diff --git a/src/MobProximityCounter.cpp b/src/MobProximityCounter.cpp
index cfd52440b..1bdac2f88 100644
--- a/src/MobProximityCounter.cpp
+++ b/src/MobProximityCounter.cpp
@@ -6,7 +6,11 @@
#include "Entities/Entity.h"
#include "Chunk.h"
-void cMobProximityCounter::CollectMob(cEntity& a_Monster, cChunk& a_Chunk, double a_Distance)
+
+
+
+
+void cMobProximityCounter::CollectMob(cEntity & a_Monster, cChunk & a_Chunk, double a_Distance)
{
// LOGD("Collecting monster %s, with distance %f", a_Monster->GetClass(), a_Distance);
tMonsterToDistance::iterator it = m_MonsterToDistance.find(&a_Monster);
diff --git a/src/MobProximityCounter.h b/src/MobProximityCounter.h
index 2dabeaa21..a3c0c125a 100644
--- a/src/MobProximityCounter.h
+++ b/src/MobProximityCounter.h
@@ -16,19 +16,19 @@ protected :
// structs used for later maps (see m_MonsterToDistance and m_DistanceToMonster)
struct sDistanceAndChunk
{
- sDistanceAndChunk(double a_Distance, cChunk& a_Chunk) : m_Distance(a_Distance), m_Chunk(&a_Chunk) {}
+ sDistanceAndChunk(double a_Distance, cChunk & a_Chunk) : m_Distance(a_Distance), m_Chunk(&a_Chunk) {}
double m_Distance;
- cChunk* m_Chunk;
+ cChunk * m_Chunk;
};
struct sMonsterAndChunk
{
- sMonsterAndChunk(cEntity& a_Monster, cChunk& a_Chunk) : m_Monster(a_Monster), m_Chunk(a_Chunk) {}
- cEntity& m_Monster;
- cChunk& m_Chunk;
+ sMonsterAndChunk(cEntity & a_Monster, cChunk & a_Chunk) : m_Monster(a_Monster), m_Chunk(a_Chunk) {}
+ cEntity & m_Monster;
+ cChunk & m_Chunk;
};
public :
- typedef std::map<cEntity*, sDistanceAndChunk> tMonsterToDistance;
+ typedef std::map<cEntity *, sDistanceAndChunk> tMonsterToDistance;
typedef std::multimap<double, sMonsterAndChunk> tDistanceToMonster;
protected :
@@ -50,7 +50,7 @@ public :
// count a mob on a specified chunk with specified distance to an unkown player
// if the distance is shortest than the one collected, this become the new closest
// distance and the chunk become the "hosting" chunk (that is the one that will perform the action)
- void CollectMob(cEntity& a_Monster, cChunk& a_Chunk, double a_Distance);
+ void CollectMob(cEntity & a_Monster, cChunk & a_Chunk, double a_Distance);
// return the mobs that are within the range of distance of the closest player they are
// that means that if a mob is 30 m from a player and 150 m from another one. It will be
diff --git a/src/MobSpawner.cpp b/src/MobSpawner.cpp
index dfeab1461..468b0cfb2 100644
--- a/src/MobSpawner.cpp
+++ b/src/MobSpawner.cpp
@@ -321,9 +321,9 @@ bool cMobSpawner::CanSpawnHere(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_R
-cMonster* cMobSpawner::TryToSpawnHere(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ, EMCSBiome a_Biome, int& a_MaxPackSize)
+cMonster * cMobSpawner::TryToSpawnHere(cChunk * a_Chunk, int a_RelX, int a_RelY, int a_RelZ, EMCSBiome a_Biome, int & a_MaxPackSize)
{
- cMonster* toReturn = nullptr;
+ cMonster * toReturn = nullptr;
if (m_NewPack)
{
m_MobType = ChooseMobType(a_Biome);
diff --git a/src/MobSpawner.h b/src/MobSpawner.h
index e8b8f191b..8b651d6bf 100644
--- a/src/MobSpawner.h
+++ b/src/MobSpawner.h
@@ -39,7 +39,7 @@ public :
// if this is the first of a Pack : determine the type of monster
// BlockType & BlockMeta are used to decide what kind of Mob can Spawn here
// MaxPackSize is set to the maximal size for a pack this type of mob
- cMonster * TryToSpawnHere(cChunk * a_Chunk, int A_RelX, int a_RelY, int a_RelZ, EMCSBiome a_Biome, int& a_MaxPackSize);
+ cMonster * TryToSpawnHere(cChunk * a_Chunk, int A_RelX, int a_RelY, int a_RelZ, EMCSBiome a_Biome, int & a_MaxPackSize);
// mark the beginning of a new Pack
// all mobs of the same Pack are the same type
diff --git a/src/MonsterConfig.h b/src/MonsterConfig.h
index 371d324c2..50979c44a 100644
--- a/src/MonsterConfig.h
+++ b/src/MonsterConfig.h
@@ -23,7 +23,7 @@ public:
private:
struct sAttributesStruct;
struct sMonsterConfigState;
- sMonsterConfigState* m_pState;
+ sMonsterConfigState * m_pState;
void Initialize();
} ;
diff --git a/src/OSSupport/Semaphore.h b/src/OSSupport/Semaphore.h
index adc531ed8..57fa4bdb2 100644
--- a/src/OSSupport/Semaphore.h
+++ b/src/OSSupport/Semaphore.h
@@ -9,7 +9,7 @@ public:
void Wait();
void Signal();
private:
- void* m_Handle; // HANDLE pointer
+ void * m_Handle; // HANDLE pointer
#ifndef _WIN32
bool m_bNamed;
diff --git a/src/Protocol/ChunkDataSerializer.cpp b/src/Protocol/ChunkDataSerializer.cpp
index 60fd5f935..2b9c06779 100644
--- a/src/Protocol/ChunkDataSerializer.cpp
+++ b/src/Protocol/ChunkDataSerializer.cpp
@@ -68,7 +68,7 @@ const AString & cChunkDataSerializer::Serialize(int a_Version, int a_ChunkX, int
void cChunkDataSerializer::Serialize29(AString & a_Data)
{
- // TODO: Do not copy data and then compress it; rather, compress partial blocks of data (zlib *can* stream)
+ // TODO: Do not copy data and then compress it; rather, compress partial blocks of data (zlib can stream)
const int BiomeDataSize = cChunkDef::Width * cChunkDef::Width;
const int MetadataOffset = sizeof(m_BlockTypes);
@@ -126,7 +126,7 @@ void cChunkDataSerializer::Serialize29(AString & a_Data)
void cChunkDataSerializer::Serialize39(AString & a_Data)
{
- // TODO: Do not copy data and then compress it; rather, compress partial blocks of data (zlib *can* stream)
+ // TODO: Do not copy data and then compress it; rather, compress partial blocks of data (zlib can stream)
const int BiomeDataSize = cChunkDef::Width * cChunkDef::Width;
const int MetadataOffset = sizeof(m_BlockTypes);
diff --git a/src/Root.cpp b/src/Root.cpp
index 1379b01a2..349608e8d 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -311,8 +311,8 @@ void cRoot::LoadWorlds(cIniFile & IniFile)
continue;
}
FoundAdditionalWorlds = true;
- cWorld* NewWorld = new cWorld( WorldName.c_str());
- m_WorldsByName[ WorldName ] = NewWorld;
+ cWorld * NewWorld = new cWorld(WorldName.c_str());
+ m_WorldsByName[WorldName] = NewWorld;
} // for i - Worlds
if (!FoundAdditionalWorlds)
diff --git a/src/Root.h b/src/Root.h
index 2f9d1eb2c..e0b6cf26c 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -218,7 +218,7 @@ private:
/// Does the actual work of executing a command
void DoExecuteConsoleCommand(const AString & a_Cmd);
- static cRoot* s_Root;
+ static cRoot * s_Root;
static void InputThread(cRoot & a_Params);
}; // tolua_export
diff --git a/src/Scoreboard.cpp b/src/Scoreboard.cpp
index adce8b549..a4a4c3391 100644
--- a/src/Scoreboard.cpp
+++ b/src/Scoreboard.cpp
@@ -286,7 +286,7 @@ cScoreboard::cScoreboard(cWorld * a_World) : m_World(a_World)
-cObjective* cScoreboard::RegisterObjective(const AString & a_Name, const AString & a_DisplayName, cObjective::eType a_Type)
+cObjective * cScoreboard::RegisterObjective(const AString & a_Name, const AString & a_DisplayName, cObjective::eType a_Type)
{
cObjective Objective(a_Name, a_DisplayName, a_Type, m_World);
@@ -471,7 +471,7 @@ cObjective * cScoreboard::GetObjectiveIn(eDisplaySlot a_Slot)
-bool cScoreboard::ForEachObjectiveWith(cObjective::eType a_Type, cObjectiveCallback& a_Callback)
+bool cScoreboard::ForEachObjectiveWith(cObjective::eType a_Type, cObjectiveCallback & a_Callback)
{
cCSLock Lock(m_CSObjectives);
@@ -493,7 +493,7 @@ bool cScoreboard::ForEachObjectiveWith(cObjective::eType a_Type, cObjectiveCallb
-bool cScoreboard::ForEachObjective(cObjectiveCallback& a_Callback)
+bool cScoreboard::ForEachObjective(cObjectiveCallback & a_Callback)
{
cCSLock Lock(m_CSObjectives);
@@ -512,7 +512,7 @@ bool cScoreboard::ForEachObjective(cObjectiveCallback& a_Callback)
-bool cScoreboard::ForEachTeam(cTeamCallback& a_Callback)
+bool cScoreboard::ForEachTeam(cTeamCallback & a_Callback)
{
cCSLock Lock(m_CSTeams);
diff --git a/src/Scoreboard.h b/src/Scoreboard.h
index dd4073c89..ab10b20aa 100644
--- a/src/Scoreboard.h
+++ b/src/Scoreboard.h
@@ -262,19 +262,16 @@ public:
cTeam * QueryPlayerTeam(const AString & a_Name); // WARNING: O(n logn)
/** Execute callback for each objective with the specified type
- Returns true if all objectives processed, false if the callback aborted by returning true.
- */
- bool ForEachObjectiveWith(cObjective::eType a_Type, cObjectiveCallback& a_Callback);
+ Returns true if all objectives processed, false if the callback aborted by returning true. */
+ bool ForEachObjectiveWith(cObjective::eType a_Type, cObjectiveCallback & a_Callback);
/** Execute callback for each objective.
- Returns true if all objectives have been processed, false if the callback aborted by returning true.
- */
- bool ForEachObjective(cObjectiveCallback& a_Callback); // Exported in ManualBindings.cpp
+ Returns true if all objectives have been processed, false if the callback aborted by returning true. */
+ bool ForEachObjective(cObjectiveCallback & a_Callback); // Exported in ManualBindings.cpp
/** Execute callback for each team.
- Returns true if all teams have been processed, false if the callback aborted by returning true.
- */
- bool ForEachTeam(cTeamCallback& a_Callback); // Exported in ManualBindings.cpp
+ Returns true if all teams have been processed, false if the callback aborted by returning true. */
+ bool ForEachTeam(cTeamCallback & a_Callback); // Exported in ManualBindings.cpp
void SetDisplay(cObjective * a_Objective, eDisplaySlot a_Slot);
diff --git a/src/StringUtils.h b/src/StringUtils.h
index 785197763..b5fc58a2d 100644
--- a/src/StringUtils.h
+++ b/src/StringUtils.h
@@ -75,7 +75,7 @@ extern int NoCaseCompare(const AString & s1, const AString & s2); // tolua_expo
/** Case-insensitive string comparison that returns a rating of equal-ness between [0 - s1.length()]. */
extern size_t RateCompareString(const AString & s1, const AString & s2);
-/** Replaces *each* occurence of iNeedle in iHayStack with iReplaceWith */
+/** Replaces each occurence of iNeedle in iHayStack with iReplaceWith */
extern void ReplaceString(AString & iHayStack, const AString & iNeedle, const AString & iReplaceWith); // tolua_export
/** Converts a stream of BE shorts into UTF-8 string; returns a_UTF8. */
diff --git a/src/Tracer.h b/src/Tracer.h
index 31531719f..55c21546b 100644
--- a/src/Tracer.h
+++ b/src/Tracer.h
@@ -64,8 +64,9 @@ private:
int GetHitNormal( const Vector3f & start, const Vector3f & end, const Vector3i & a_BlockPos);
/// Signum function
- int SigNum( float a_Num);
- cWorld* m_World;
+ int SigNum(float a_Num);
+
+ cWorld * m_World;
static const std::array<const Vector3f, 6> & m_NormalTable(void);
diff --git a/src/UI/MinecartWithChestWindow.h b/src/UI/MinecartWithChestWindow.h
index a2b5283a6..87e8f6137 100644
--- a/src/UI/MinecartWithChestWindow.h
+++ b/src/UI/MinecartWithChestWindow.h
@@ -33,7 +33,7 @@ public:
a_ChestCart->GetWorld()->BroadcastSoundEffect("random.chestopen", a_ChestCart->GetPosX(), a_ChestCart->GetPosY(), a_ChestCart->GetPosZ(), 1, 1);
}
- virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea* a_ClickedArea, bool a_ShouldApply) override
+ virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override
{
cSlotAreas AreasInOrder;
diff --git a/src/WebAdmin.cpp b/src/WebAdmin.cpp
index 484626de3..1cb4463e1 100644
--- a/src/WebAdmin.cpp
+++ b/src/WebAdmin.cpp
@@ -531,7 +531,7 @@ AString cWebAdmin::GetDefaultPage(void)
-AString cWebAdmin::GetBaseURL( const AString& a_URL)
+AString cWebAdmin::GetBaseURL(const AString & a_URL)
{
return GetBaseURL(StringSplit(a_URL, "/"));
}
diff --git a/src/World.cpp b/src/World.cpp
index d0406f078..648c9cd19 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -1351,7 +1351,7 @@ bool cWorld::DoWithBlockEntityAt(int a_BlockX, int a_BlockY, int a_BlockZ, cBloc
-bool cWorld::DoWithBeaconAt(int a_BlockX, int a_BlockY, int a_BlockZ, cBeaconCallback& a_Callback)
+bool cWorld::DoWithBeaconAt(int a_BlockX, int a_BlockY, int a_BlockZ, cBeaconCallback & a_Callback)
{
return m_ChunkMap->DoWithBeaconAt(a_BlockX, a_BlockY, a_BlockZ, a_Callback);
}
diff --git a/src/WorldStorage/EnchantmentSerializer.cpp b/src/WorldStorage/EnchantmentSerializer.cpp
index 56072207f..a6e562956 100644
--- a/src/WorldStorage/EnchantmentSerializer.cpp
+++ b/src/WorldStorage/EnchantmentSerializer.cpp
@@ -5,7 +5,7 @@
#include "Enchantments.h"
#include "FastNBT.h"
-void EnchantmentSerializer::WriteToNBTCompound(cEnchantments const& a_Enchantments, cFastNBTWriter & a_Writer, const AString & a_ListTagName)
+void EnchantmentSerializer::WriteToNBTCompound(const cEnchantments & a_Enchantments, cFastNBTWriter & a_Writer, const AString & a_ListTagName)
{
// Write the enchantments into the specified NBT writer
// begin with the LIST tag of the specified name ("ench" or "StoredEnchantments")
@@ -25,7 +25,7 @@ void EnchantmentSerializer::WriteToNBTCompound(cEnchantments const& a_Enchantmen
-void EnchantmentSerializer::ParseFromNBT(cEnchantments& a_Enchantments, const cParsedNBT & a_NBT, int a_EnchListTagIdx)
+void EnchantmentSerializer::ParseFromNBT(cEnchantments & a_Enchantments, const cParsedNBT & a_NBT, int a_EnchListTagIdx)
{
// Read the enchantments from the specified NBT list tag (ench or StoredEnchantments)
diff --git a/src/WorldStorage/EnchantmentSerializer.h b/src/WorldStorage/EnchantmentSerializer.h
index 9ed362900..7d6546aad 100644
--- a/src/WorldStorage/EnchantmentSerializer.h
+++ b/src/WorldStorage/EnchantmentSerializer.h
@@ -9,9 +9,9 @@ namespace EnchantmentSerializer
{
/// Writes the enchantments into the specified NBT writer; begins with the LIST tag of the specified name ("ench" or "StoredEnchantments")
- void WriteToNBTCompound(cEnchantments const& a_Enchantments, cFastNBTWriter & a_Writer, const AString & a_ListTagName);
+ void WriteToNBTCompound(const cEnchantments & a_Enchantments, cFastNBTWriter & a_Writer, const AString & a_ListTagName);
/// Reads the enchantments from the specified NBT list tag (ench or StoredEnchantments)
- void ParseFromNBT(cEnchantments& a_Enchantments, const cParsedNBT & a_NBT, int a_EnchListTagIdx);
+ void ParseFromNBT(cEnchantments & a_Enchantments, const cParsedNBT & a_NBT, int a_EnchListTagIdx);
};
diff --git a/src/WorldStorage/MapSerializer.cpp b/src/WorldStorage/MapSerializer.cpp
index 6f0449041..da7b9d929 100644
--- a/src/WorldStorage/MapSerializer.cpp
+++ b/src/WorldStorage/MapSerializer.cpp
@@ -15,8 +15,8 @@
-cMapSerializer::cMapSerializer(const AString& a_WorldName, cMap * a_Map)
- : m_Map(a_Map)
+cMapSerializer::cMapSerializer(const AString & a_WorldName, cMap * a_Map):
+ m_Map(a_Map)
{
AString DataPath;
Printf(DataPath, "%s%cdata", a_WorldName.c_str(), cFile::PathSeparator);
diff --git a/src/WorldStorage/MapSerializer.h b/src/WorldStorage/MapSerializer.h
index e13a75c8f..007f1347b 100644
--- a/src/WorldStorage/MapSerializer.h
+++ b/src/WorldStorage/MapSerializer.h
@@ -26,7 +26,7 @@ class cMapSerializer
{
public:
- cMapSerializer(const AString& a_WorldName, cMap * a_Map);
+ cMapSerializer(const AString & a_WorldName, cMap * a_Map);
/** Try to load the map */
bool Load(void);
diff --git a/src/WorldStorage/ScoreboardSerializer.cpp b/src/WorldStorage/ScoreboardSerializer.cpp
index 0d8730e49..01e56dbe1 100644
--- a/src/WorldStorage/ScoreboardSerializer.cpp
+++ b/src/WorldStorage/ScoreboardSerializer.cpp
@@ -14,13 +14,13 @@
-cScoreboardSerializer::cScoreboardSerializer(const AString & a_WorldName, cScoreboard* a_ScoreBoard)
- : m_ScoreBoard(a_ScoreBoard)
+cScoreboardSerializer::cScoreboardSerializer(const AString & a_WorldName, cScoreboard * a_ScoreBoard):
+ m_ScoreBoard(a_ScoreBoard)
{
AString DataPath;
Printf(DataPath, "%s%cdata", a_WorldName.c_str(), cFile::PathSeparator);
- m_Path = DataPath + "/scoreboard.dat";
+ m_Path = DataPath + cFile::PathSeparator + "scoreboard.dat";
cFile::CreateFolder(FILE_IO_PREFIX + DataPath);
}
diff --git a/src/WorldStorage/ScoreboardSerializer.h b/src/WorldStorage/ScoreboardSerializer.h
index 048fa3ab4..f9065b35f 100644
--- a/src/WorldStorage/ScoreboardSerializer.h
+++ b/src/WorldStorage/ScoreboardSerializer.h
@@ -25,7 +25,7 @@ class cScoreboardSerializer
{
public:
- cScoreboardSerializer(const AString & a_WorldName, cScoreboard* a_ScoreBoard);
+ cScoreboardSerializer(const AString & a_WorldName, cScoreboard * a_ScoreBoard);
/// Try to load the scoreboard
bool Load(void);
@@ -40,7 +40,7 @@ private:
bool LoadScoreboardFromNBT(const cParsedNBT & a_NBT);
- cScoreboard* m_ScoreBoard;
+ cScoreboard * m_ScoreBoard;
AString m_Path;
diff --git a/src/WorldStorage/StatSerializer.h b/src/WorldStorage/StatSerializer.h
index 72f8d74f1..6b7efddbb 100644
--- a/src/WorldStorage/StatSerializer.h
+++ b/src/WorldStorage/StatSerializer.h
@@ -43,7 +43,7 @@ protected:
private:
- cStatManager* m_Manager;
+ cStatManager * m_Manager;
AString m_Path;
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index f389e7cbf..392b9bf83 100755
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -3148,7 +3148,7 @@ bool cWSSAnvil::cMCAFile::SetChunkData(const cChunkCoords & a_Chunk, const AStri
}
// Store the header:
- ChunkSize = ((u_long)a_Data.size() + MCA_CHUNK_HEADER_LENGTH + 4095) / 4096; // Round data size *up* to nearest 4KB sector, make it a sector number
+ ChunkSize = ((u_long)a_Data.size() + MCA_CHUNK_HEADER_LENGTH + 4095) / 4096; // Round data size up to nearest 4KB sector, make it a sector number
if (ChunkSize > 255)
{
LOGWARNING("Cannot save chunk [%d, %d], the data is too large (%u KiB, maximum is 1024 KiB). Remove some entities and retry.",