flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Normalized comments.

Browse Source 
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
This commit is contained in:
madmaxoft 2014-07-17 22:15:34 +02:00
parent 7fff12bfac
commit 2423fbf2ef
173 changed files with 893 additions and 867 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Bindings/DeprecatedBindings.cpp
View File

@ -39,7 +39,7 @@ static int tolua_get_AllToLua_g_BlockLightValue(lua_State* tolua_S)
tolua_pushnumber(tolua_S,(lua_Number)cBlockInfo::GetLightValue((BLOCKTYPE)BlockType)); tolua_pushnumber(tolua_S,(lua_Number)cBlockInfo::GetLightValue((BLOCKTYPE)BlockType));
return 1; return 1;
} }
#endif //#ifndef TOLUA_DISABLE #endif // #ifndef TOLUA_DISABLE
@ -65,7 +65,7 @@ static int tolua_get_AllToLua_g_BlockSpreadLightFalloff(lua_State* tolua_S)
tolua_pushnumber(tolua_S, (lua_Number)cBlockInfo::GetSpreadLightFalloff((BLOCKTYPE)BlockType)); tolua_pushnumber(tolua_S, (lua_Number)cBlockInfo::GetSpreadLightFalloff((BLOCKTYPE)BlockType));
return 1; return 1;
} }
#endif //#ifndef TOLUA_DISABLE #endif // #ifndef TOLUA_DISABLE
@ -91,7 +91,7 @@ static int tolua_get_AllToLua_g_BlockTransparent(lua_State* tolua_S)
tolua_pushboolean(tolua_S, cBlockInfo::IsTransparent((BLOCKTYPE)BlockType)); tolua_pushboolean(tolua_S, cBlockInfo::IsTransparent((BLOCKTYPE)BlockType));
return 1; return 1;
} }
#endif //#ifndef TOLUA_DISABLE #endif // #ifndef TOLUA_DISABLE
@ -117,7 +117,7 @@ static int tolua_get_AllToLua_g_BlockOneHitDig(lua_State* tolua_S)
tolua_pushboolean(tolua_S, cBlockInfo::IsOneHitDig((BLOCKTYPE)BlockType)); tolua_pushboolean(tolua_S, cBlockInfo::IsOneHitDig((BLOCKTYPE)BlockType));
return 1; return 1;
} }
#endif //#ifndef TOLUA_DISABLE #endif // #ifndef TOLUA_DISABLE
@ -143,7 +143,7 @@ static int tolua_get_AllToLua_g_BlockPistonBreakable(lua_State* tolua_S)
tolua_pushboolean(tolua_S, cBlockInfo::IsPistonBreakable((BLOCKTYPE)BlockType)); tolua_pushboolean(tolua_S, cBlockInfo::IsPistonBreakable((BLOCKTYPE)BlockType));
return 1; return 1;
} }
#endif //#ifndef TOLUA_DISABLE #endif // #ifndef TOLUA_DISABLE
@ -169,7 +169,7 @@ static int tolua_get_AllToLua_g_BlockIsSnowable(lua_State* tolua_S)
tolua_pushboolean(tolua_S, cBlockInfo::IsSnowable((BLOCKTYPE)BlockType)); tolua_pushboolean(tolua_S, cBlockInfo::IsSnowable((BLOCKTYPE)BlockType));
return 1; return 1;
} }
#endif //#ifndef TOLUA_DISABLE #endif // #ifndef TOLUA_DISABLE
@ -195,7 +195,7 @@ static int tolua_get_AllToLua_g_BlockRequiresSpecialTool(lua_State* tolua_S)
tolua_pushboolean(tolua_S, cBlockInfo::RequiresSpecialTool((BLOCKTYPE)BlockType)); tolua_pushboolean(tolua_S, cBlockInfo::RequiresSpecialTool((BLOCKTYPE)BlockType));
return 1; return 1;
} }
#endif //#ifndef TOLUA_DISABLE #endif // #ifndef TOLUA_DISABLE
@ -221,7 +221,7 @@ static int tolua_get_AllToLua_g_BlockIsSolid(lua_State* tolua_S)
tolua_pushboolean(tolua_S, (bool)cBlockInfo::IsSolid((BLOCKTYPE)BlockType)); tolua_pushboolean(tolua_S, (bool)cBlockInfo::IsSolid((BLOCKTYPE)BlockType));
return 1; return 1;
} }
#endif //#ifndef TOLUA_DISABLE #endif // #ifndef TOLUA_DISABLE
@ -247,7 +247,7 @@ static int tolua_get_AllToLua_g_BlockFullyOccupiesVoxel(lua_State* tolua_S)
tolua_pushboolean(tolua_S, (bool)cBlockInfo::FullyOccupiesVoxel((BLOCKTYPE)BlockType)); tolua_pushboolean(tolua_S, (bool)cBlockInfo::FullyOccupiesVoxel((BLOCKTYPE)BlockType));
return 1; return 1;
} }
#endif //#ifndef TOLUA_DISABLE #endif // #ifndef TOLUA_DISABLE

4
src/Bindings/LuaState.cpp
View File

@ -40,7 +40,7 @@ const cLuaState::cRet cLuaState::Return = {};
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cLuaState: // cLuaState:
cLuaState::cLuaState(const AString & a_SubsystemName) : cLuaState::cLuaState(const AString & a_SubsystemName) :
@ -1371,7 +1371,7 @@ int cLuaState::ReportFnCallErrors(lua_State * a_LuaState)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cLuaState::cRef: // cLuaState::cRef:
cLuaState::cRef::cRef(void) : cLuaState::cRef::cRef(void) :

2
src/Bindings/LuaWindow.cpp
View File

@ -13,7 +13,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cLuaWindow: // cLuaWindow:
cLuaWindow::cLuaWindow(cWindow::WindowType a_WindowType, int a_SlotsX, int a_SlotsY, const AString & a_Title) : cLuaWindow::cLuaWindow(cWindow::WindowType a_WindowType, int a_SlotsX, int a_SlotsY, const AString & a_Title) :

2
src/Bindings/ManualBindings.cpp
View File

@ -2065,7 +2065,7 @@ static int tolua_get_HTTPRequest_FormData(lua_State* tolua_S)
{ {
lua_pushstring(tolua_S, it->first.c_str() ); lua_pushstring(tolua_S, it->first.c_str() );
tolua_pushusertype(tolua_S, &(it->second), "HTTPFormData" ); tolua_pushusertype(tolua_S, &(it->second), "HTTPFormData" );
//lua_pushlstring(tolua_S, it->second.Value.c_str(), it->second.Value.size() ); // Might contain binary data // lua_pushlstring(tolua_S, it->second.Value.c_str(), it->second.Value.size() ); // Might contain binary data
lua_settable(tolua_S, top); lua_settable(tolua_S, top);
} }

2
src/Bindings/PluginLua.cpp
View File

@ -25,7 +25,7 @@ extern "C"
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cPluginLua: // cPluginLua:
cPluginLua::cPluginLua(const AString & a_PluginDirectory) : cPluginLua::cPluginLua(const AString & a_PluginDirectory) :

4
src/BlockArea.cpp
View File

@ -269,7 +269,7 @@ void MergeCombinatorMask(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBlockArea: // cBlockArea:
cBlockArea::cBlockArea(void) : cBlockArea::cBlockArea(void) :
@ -1759,7 +1759,7 @@ NIBBLETYPE cBlockArea::GetNibble(int a_BlockX, int a_BlockY, int a_BlockZ, NIBBL
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBlockArea::cChunkReader: // cBlockArea::cChunkReader:
cBlockArea::cChunkReader::cChunkReader(cBlockArea & a_Area) : cBlockArea::cChunkReader::cChunkReader(cBlockArea & a_Area) :

4
src/BlockID.h
View File

@ -399,7 +399,7 @@ enum
// Please keep this list alpha-sorted by the blocktype / itemtype part // Please keep this list alpha-sorted by the blocktype / itemtype part
// then number-sorted for the same block / item // then number-sorted for the same block / item
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Block metas: // Block metas:
// E_BLOCK_BIG_FLOWER metas // E_BLOCK_BIG_FLOWER metas
@ -678,7 +678,7 @@ enum
E_META_WOOL_RED = 14, E_META_WOOL_RED = 14,
E_META_WOOL_BLACK = 15, E_META_WOOL_BLACK = 15,
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Item metas: // Item metas:
// E_ITEM_COAL metas: // E_ITEM_COAL metas:

2
src/Blocks/BlockEnderchest.h
View File

@ -18,7 +18,7 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{ {
//todo: Drop Ender Chest if using silk touch pickaxe // todo: Drop Ender Chest if using silk touch pickaxe
a_Pickups.push_back(cItem(E_BLOCK_OBSIDIAN, 8, 0)); a_Pickups.push_back(cItem(E_BLOCK_OBSIDIAN, 8, 0));
} }

2
src/Blocks/BlockPiston.cpp
View File

@ -235,7 +235,7 @@ void cBlockPistonHandler::RetractPiston(int a_BlockX, int a_BlockY, int a_BlockZ
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBlockPistonHeadHandler: // cBlockPistonHeadHandler:
cBlockPistonHeadHandler::cBlockPistonHeadHandler(void) : cBlockPistonHeadHandler::cBlockPistonHeadHandler(void) :

2
src/ByteBuffer.cpp
View File

@ -140,7 +140,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cByteBuffer: // cByteBuffer:
cByteBuffer::cByteBuffer(size_t a_BufferSize) : cByteBuffer::cByteBuffer(size_t a_BufferSize) :

4
src/Chunk.cpp
View File

@ -41,7 +41,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// sSetBlock: // sSetBlock:
sSetBlock::sSetBlock( int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta ) // absolute block position sSetBlock::sSetBlock( int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta ) // absolute block position
@ -58,7 +58,7 @@ sSetBlock::sSetBlock( int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_Bloc
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cChunk: // cChunk:
cChunk::cChunk( cChunk::cChunk(

4
src/ChunkSender.cpp
View File

@ -17,7 +17,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cNotifyChunkSender: // cNotifyChunkSender:
void cNotifyChunkSender::Call(int a_ChunkX, int a_ChunkZ) void cNotifyChunkSender::Call(int a_ChunkX, int a_ChunkZ)
@ -29,7 +29,7 @@ void cNotifyChunkSender::Call(int a_ChunkX, int a_ChunkZ)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cChunkSender: // cChunkSender:
cChunkSender::cChunkSender(void) : cChunkSender::cChunkSender(void) :

2
src/ClientHandle.cpp
View File

@ -60,7 +60,7 @@ int cClientHandle::s_ClientCount = 0;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cClientHandle: // cClientHandle:
cClientHandle::cClientHandle(const cSocket * a_Socket, int a_ViewDistance) : cClientHandle::cClientHandle(const cSocket * a_Socket, int a_ViewDistance) :

4
src/CommandOutput.cpp
View File

@ -10,7 +10,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCommandOutputCallback: // cCommandOutputCallback:
void cCommandOutputCallback::Out(const char * a_Fmt, ...) void cCommandOutputCallback::Out(const char * a_Fmt, ...)
@ -28,7 +28,7 @@ void cCommandOutputCallback::Out(const char * a_Fmt, ...)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cLogCommandOutputCallback: // cLogCommandOutputCallback:
void cLogCommandOutputCallback::Out(const AString & a_Text) void cLogCommandOutputCallback::Out(const AString & a_Text)

18
src/CompositeChat.cpp
View File

@ -100,7 +100,7 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompositeChat: // cCompositeChat:
cCompositeChat::cCompositeChat(void) : cCompositeChat::cCompositeChat(void) :
@ -399,7 +399,7 @@ void cCompositeChat::AddStyle(AString & a_Style, const AString & a_AddStyle)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompositeChat::cBasePart: // cCompositeChat::cBasePart:
cCompositeChat::cBasePart::cBasePart(cCompositeChat::ePartType a_PartType, const AString & a_Text, const AString & a_Style) : cCompositeChat::cBasePart::cBasePart(cCompositeChat::ePartType a_PartType, const AString & a_Text, const AString & a_Style) :
@ -413,7 +413,7 @@ cCompositeChat::cBasePart::cBasePart(cCompositeChat::ePartType a_PartType, const
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompositeChat::cTextPart: // cCompositeChat::cTextPart:
cCompositeChat::cTextPart::cTextPart(const AString & a_Text, const AString &a_Style) : cCompositeChat::cTextPart::cTextPart(const AString & a_Text, const AString &a_Style) :
@ -425,7 +425,7 @@ cCompositeChat::cTextPart::cTextPart(const AString & a_Text, const AString &a_St
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompositeChat::cClientTranslatedPart: // cCompositeChat::cClientTranslatedPart:
cCompositeChat::cClientTranslatedPart::cClientTranslatedPart(const AString & a_TranslationID, const AStringVector & a_Parameters, const AString & a_Style) : cCompositeChat::cClientTranslatedPart::cClientTranslatedPart(const AString & a_TranslationID, const AStringVector & a_Parameters, const AString & a_Style) :
@ -438,7 +438,7 @@ cCompositeChat::cClientTranslatedPart::cClientTranslatedPart(const AString & a_T
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompositeChat::cUrlPart: // cCompositeChat::cUrlPart:
cCompositeChat::cUrlPart::cUrlPart(const AString & a_Text, const AString & a_Url, const AString & a_Style) : cCompositeChat::cUrlPart::cUrlPart(const AString & a_Text, const AString & a_Url, const AString & a_Style) :
@ -451,7 +451,7 @@ cCompositeChat::cUrlPart::cUrlPart(const AString & a_Text, const AString & a_Url
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompositeChat::cCommandPart: // cCompositeChat::cCommandPart:
cCompositeChat::cCommandPart::cCommandPart(ePartType a_PartType, const AString & a_Text, const AString & a_Command, const AString & a_Style) : cCompositeChat::cCommandPart::cCommandPart(ePartType a_PartType, const AString & a_Text, const AString & a_Command, const AString & a_Style) :
@ -464,7 +464,7 @@ cCompositeChat::cCommandPart::cCommandPart(ePartType a_PartType, const AString &
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompositeChat::cRunCommandPart: // cCompositeChat::cRunCommandPart:
cCompositeChat::cRunCommandPart::cRunCommandPart(const AString & a_Text, const AString & a_Command, const AString & a_Style) : cCompositeChat::cRunCommandPart::cRunCommandPart(const AString & a_Text, const AString & a_Command, const AString & a_Style) :
@ -475,7 +475,7 @@ cCompositeChat::cRunCommandPart::cRunCommandPart(const AString & a_Text, const A
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompositeChat::cSuggestCommandPart: // cCompositeChat::cSuggestCommandPart:
cCompositeChat::cSuggestCommandPart::cSuggestCommandPart(const AString & a_Text, const AString & a_Command, const AString & a_Style) : cCompositeChat::cSuggestCommandPart::cSuggestCommandPart(const AString & a_Text, const AString & a_Command, const AString & a_Style) :
@ -487,7 +487,7 @@ cCompositeChat::cSuggestCommandPart::cSuggestCommandPart(const AString & a_Text,
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompositeChat::cShowAchievementPart: // cCompositeChat::cShowAchievementPart:
cCompositeChat::cShowAchievementPart::cShowAchievementPart(const AString & a_PlayerName, const AString & a_Achievement, const AString & a_Style) : cCompositeChat::cShowAchievementPart::cShowAchievementPart(const AString & a_PlayerName, const AString & a_Achievement, const AString & a_Style) :

6
src/CraftingRecipes.cpp
View File

@ -12,7 +12,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCraftingGrid: // cCraftingGrid:
cCraftingGrid::cCraftingGrid(int a_Width, int a_Height) : cCraftingGrid::cCraftingGrid(int a_Width, int a_Height) :
@ -206,7 +206,7 @@ void cCraftingGrid::Dump(void)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCraftingRecipe: // cCraftingRecipe:
cCraftingRecipe::cCraftingRecipe(const cCraftingGrid & a_CraftingGrid) : cCraftingRecipe::cCraftingRecipe(const cCraftingGrid & a_CraftingGrid) :
@ -259,7 +259,7 @@ void cCraftingRecipe::Dump(void)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCraftingRecipes: // cCraftingRecipes:
cCraftingRecipes::cCraftingRecipes(void) cCraftingRecipes::cCraftingRecipes(void)

2
src/Cuboid.cpp
View File

@ -21,7 +21,7 @@ static bool DoIntervalsIntersect(int a_Min1, int a_Max1, int a_Min2, int a_Max2)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCuboid: // cCuboid:
void cCuboid::Assign(int a_X1, int a_Y1, int a_Z1, int a_X2, int a_Y2, int a_Z2) void cCuboid::Assign(int a_X1, int a_Y1, int a_Z1, int a_X2, int a_Y2, int a_Z2)

8
src/Entities/Entity.cpp
View File

@ -768,10 +768,10 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
NextSpeed.z *= 0.25; NextSpeed.z *= 0.25;
} }
//Get water direction // Get water direction
Direction WaterDir = m_World->GetWaterSimulator()->GetFlowingDirection(BlockX, BlockY, BlockZ); Direction WaterDir = m_World->GetWaterSimulator()->GetFlowingDirection(BlockX, BlockY, BlockZ);
m_WaterSpeed *= 0.9f; //Reduce speed each tick m_WaterSpeed *= 0.9f; // Reduce speed each tick
switch(WaterDir) switch(WaterDir)
{ {
@ -1587,7 +1587,7 @@ void cEntity::SteerVehicle(float a_Forward, float a_Sideways)
////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Get look vector (this is NOT a rotation!) // Get look vector (this is NOT a rotation!)
Vector3d cEntity::GetLookVector(void) const Vector3d cEntity::GetLookVector(void) const
{ {
@ -1601,7 +1601,7 @@ Vector3d cEntity::GetLookVector(void) const
////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Set position // Set position
void cEntity::SetPosition(double a_PosX, double a_PosY, double a_PosZ) void cEntity::SetPosition(double a_PosX, double a_PosY, double a_PosZ)
{ {

16
src/Entities/EntityEffect.cpp
View File

@ -108,7 +108,7 @@ void cEntityEffect::OnTick(cPawn & a_Target)
///////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEntityEffectInstantHealth: // cEntityEffectInstantHealth:
void cEntityEffectInstantHealth::OnActivate(cPawn & a_Target) void cEntityEffectInstantHealth::OnActivate(cPawn & a_Target)
@ -128,7 +128,7 @@ void cEntityEffectInstantHealth::OnActivate(cPawn & a_Target)
///////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEntityEffectInstantDamage: // cEntityEffectInstantDamage:
void cEntityEffectInstantDamage::OnActivate(cPawn & a_Target) void cEntityEffectInstantDamage::OnActivate(cPawn & a_Target)
@ -148,7 +148,7 @@ void cEntityEffectInstantDamage::OnActivate(cPawn & a_Target)
///////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEntityEffectRegeneration: // cEntityEffectRegeneration:
void cEntityEffectRegeneration::OnTick(cPawn & a_Target) void cEntityEffectRegeneration::OnTick(cPawn & a_Target)
@ -175,7 +175,7 @@ void cEntityEffectRegeneration::OnTick(cPawn & a_Target)
///////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEntityEffectHunger: // cEntityEffectHunger:
void cEntityEffectHunger::OnTick(cPawn & a_Target) void cEntityEffectHunger::OnTick(cPawn & a_Target)
@ -193,7 +193,7 @@ void cEntityEffectHunger::OnTick(cPawn & a_Target)
///////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEntityEffectWeakness: // cEntityEffectWeakness:
void cEntityEffectWeakness::OnTick(cPawn & a_Target) void cEntityEffectWeakness::OnTick(cPawn & a_Target)
@ -211,7 +211,7 @@ void cEntityEffectWeakness::OnTick(cPawn & a_Target)
///////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEntityEffectPoison: // cEntityEffectPoison:
void cEntityEffectPoison::OnTick(cPawn & a_Target) void cEntityEffectPoison::OnTick(cPawn & a_Target)
@ -250,7 +250,7 @@ void cEntityEffectPoison::OnTick(cPawn & a_Target)
///////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEntityEffectWither: // cEntityEffectWither:
void cEntityEffectWither::OnTick(cPawn & a_Target) void cEntityEffectWither::OnTick(cPawn & a_Target)
@ -270,7 +270,7 @@ void cEntityEffectWither::OnTick(cPawn & a_Target)
///////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEntityEffectSaturation: // cEntityEffectSaturation:
void cEntityEffectSaturation::OnTick(cPawn & a_Target) void cEntityEffectSaturation::OnTick(cPawn & a_Target)

4
src/Entities/Floater.cpp
View File

@ -11,7 +11,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFloaterEntityCollisionCallback // cFloaterEntityCollisionCallback
class cFloaterEntityCollisionCallback : class cFloaterEntityCollisionCallback :
public cEntityCallback public cEntityCallback
@ -75,7 +75,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFloaterCheckEntityExist // cFloaterCheckEntityExist
class cFloaterCheckEntityExist : class cFloaterCheckEntityExist :
public cEntityCallback public cEntityCallback

2
src/Entities/Floater.h
View File

@ -14,7 +14,7 @@ class cFloater :
typedef cEntity super; typedef cEntity super;
public: public:
//tolua_end // tolua_end
CLASS_PROTODEF(cFloater); CLASS_PROTODEF(cFloater);

10
src/Entities/Minecart.cpp
View File

@ -980,7 +980,7 @@ void cMinecart::Destroyed()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cRideableMinecart: // cRideableMinecart:
cRideableMinecart::cRideableMinecart(double a_X, double a_Y, double a_Z, const cItem & a_Content, int a_Height) : cRideableMinecart::cRideableMinecart(double a_X, double a_Y, double a_Z, const cItem & a_Content, int a_Height) :
@ -1023,7 +1023,7 @@ void cRideableMinecart::OnRightClicked(cPlayer & a_Player)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cMinecartWithChest: // cMinecartWithChest:
cMinecartWithChest::cMinecartWithChest(double a_X, double a_Y, double a_Z) : cMinecartWithChest::cMinecartWithChest(double a_X, double a_Y, double a_Z) :
@ -1056,7 +1056,7 @@ void cMinecartWithChest::OnRightClicked(cPlayer & a_Player)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cMinecartWithFurnace: // cMinecartWithFurnace:
cMinecartWithFurnace::cMinecartWithFurnace(double a_X, double a_Y, double a_Z) : cMinecartWithFurnace::cMinecartWithFurnace(double a_X, double a_Y, double a_Z) :
@ -1118,7 +1118,7 @@ void cMinecartWithFurnace::Tick(float a_Dt, cChunk & a_Chunk)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cMinecartWithTNT: // cMinecartWithTNT:
cMinecartWithTNT::cMinecartWithTNT(double a_X, double a_Y, double a_Z) : cMinecartWithTNT::cMinecartWithTNT(double a_X, double a_Y, double a_Z) :
@ -1132,7 +1132,7 @@ cMinecartWithTNT::cMinecartWithTNT(double a_X, double a_Y, double a_Z) :
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cMinecartWithHopper: // cMinecartWithHopper:
cMinecartWithHopper::cMinecartWithHopper(double a_X, double a_Y, double a_Z) : cMinecartWithHopper::cMinecartWithHopper(double a_X, double a_Y, double a_Z) :

2
src/Entities/Pickup.cpp
View File

@ -113,7 +113,7 @@ void cPickup::SpawnOn(cClientHandle & a_Client)
void cPickup::Tick(float a_Dt, cChunk & a_Chunk) void cPickup::Tick(float a_Dt, cChunk & a_Chunk)
{ {
super::Tick(a_Dt, a_Chunk); super::Tick(a_Dt, a_Chunk);
BroadcastMovementUpdate(); //Notify clients of position BroadcastMovementUpdate(); // Notify clients of position
m_Timer += a_Dt; m_Timer += a_Dt;

16
src/Entities/Player.cpp
View File

@ -284,19 +284,19 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
short cPlayer::CalcLevelFromXp(short a_XpTotal) short cPlayer::CalcLevelFromXp(short a_XpTotal)
{ {
//level 0 to 15 // level 0 to 15
if(a_XpTotal <= XP_TO_LEVEL15) if(a_XpTotal <= XP_TO_LEVEL15)
{ {
return a_XpTotal / XP_PER_LEVEL_TO15; return a_XpTotal / XP_PER_LEVEL_TO15;
} }
//level 30+ // level 30+
if(a_XpTotal > XP_TO_LEVEL30) if(a_XpTotal > XP_TO_LEVEL30)
{ {
return (short) (151.5 + sqrt( 22952.25 - (14 * (2220 - a_XpTotal)))) / 7; return (short) (151.5 + sqrt( 22952.25 - (14 * (2220 - a_XpTotal)))) / 7;
} }
//level 16 to 30 // level 16 to 30
return (short) ( 29.5 + sqrt( 870.25 - (6 * ( 360 - a_XpTotal )))) / 3; return (short) ( 29.5 + sqrt( 870.25 - (6 * ( 360 - a_XpTotal )))) / 3;
} }
@ -306,19 +306,19 @@ short cPlayer::CalcLevelFromXp(short a_XpTotal)
short cPlayer::XpForLevel(short a_Level) short cPlayer::XpForLevel(short a_Level)
{ {
//level 0 to 15 // level 0 to 15
if(a_Level <= 15) if(a_Level <= 15)
{ {
return a_Level * XP_PER_LEVEL_TO15; return a_Level * XP_PER_LEVEL_TO15;
} }
//level 30+ // level 30+
if(a_Level >= 31) if(a_Level >= 31)
{ {
return (short) ( (3.5 * a_Level * a_Level) - (151.5 * a_Level) + 2220 ); return (short) ( (3.5 * a_Level * a_Level) - (151.5 * a_Level) + 2220 );
} }
//level 16 to 30 // level 16 to 30
return (short) ( (1.5 * a_Level * a_Level) - (29.5 * a_Level) + 360 ); return (short) ( (1.5 * a_Level * a_Level) - (29.5 * a_Level) + 360 );
} }
@ -353,7 +353,7 @@ bool cPlayer::SetCurrentExperience(short int a_CurrentXp)
if(!(a_CurrentXp >= 0) || (a_CurrentXp > (SHRT_MAX - m_LifetimeTotalXp))) if(!(a_CurrentXp >= 0) || (a_CurrentXp > (SHRT_MAX - m_LifetimeTotalXp)))
{ {
LOGWARNING("Tried to update experiece with an invalid Xp value: %d", a_CurrentXp); LOGWARNING("Tried to update experiece with an invalid Xp value: %d", a_CurrentXp);
return false; //oops, they gave us a dodgey number return false; // oops, they gave us a dodgey number
} }
m_CurrentXp = a_CurrentXp; m_CurrentXp = a_CurrentXp;
@ -623,7 +623,7 @@ void cPlayer::FinishEating(void)
GetInventory().RemoveOneEquippedItem(); GetInventory().RemoveOneEquippedItem();
//if the food is mushroom soup, return a bowl to the inventory // if the food is mushroom soup, return a bowl to the inventory
if( Item.m_ItemType == E_ITEM_MUSHROOM_SOUP ) { if( Item.m_ItemType == E_ITEM_MUSHROOM_SOUP ) {
cItem emptyBowl(E_ITEM_BOWL, 1, 0, ""); cItem emptyBowl(E_ITEM_BOWL, 1, 0, "");
GetInventory().AddItem(emptyBowl, true, true); GetInventory().AddItem(emptyBowl, true, true);

6
src/Entities/ProjectileEntity.cpp
View File

@ -35,7 +35,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProjectileTracerCallback: // cProjectileTracerCallback:
class cProjectileTracerCallback : class cProjectileTracerCallback :
@ -122,7 +122,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProjectileEntityCollisionCallback: // cProjectileEntityCollisionCallback:
class cProjectileEntityCollisionCallback : class cProjectileEntityCollisionCallback :
@ -211,7 +211,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProjectileEntity: // cProjectileEntity:
cProjectileEntity::cProjectileEntity(eKind a_Kind, cEntity * a_Creator, double a_X, double a_Y, double a_Z, double a_Width, double a_Height) : cProjectileEntity::cProjectileEntity(eKind a_Kind, cEntity * a_Creator, double a_X, double a_Y, double a_Z, double a_Width, double a_Height) :

4
src/Entities/SplashPotionEntity.cpp
View File

@ -7,7 +7,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSplashPotionEntityCallback: // cSplashPotionEntityCallback:
/** Used to distribute the splashed potion effect among nearby entities */ /** Used to distribute the splashed potion effect among nearby entities */
@ -63,7 +63,7 @@ private:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSplashPotionEntity: // cSplashPotionEntity:
cSplashPotionEntity::cSplashPotionEntity( cSplashPotionEntity::cSplashPotionEntity(

18
src/Generating/BioGen.cpp
View File

@ -12,7 +12,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBiomeGen: // cBiomeGen:
cBiomeGen * cBiomeGen::CreateBiomeGen(cIniFile & a_IniFile, int a_Seed, bool & a_CacheOffByDefault) cBiomeGen * cBiomeGen::CreateBiomeGen(cIniFile & a_IniFile, int a_Seed, bool & a_CacheOffByDefault)
@ -78,7 +78,7 @@ cBiomeGen * cBiomeGen::CreateBiomeGen(cIniFile & a_IniFile, int a_Seed, bool & a
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBioGenConstant: // cBioGenConstant:
void cBioGenConstant::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) void cBioGenConstant::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap)
@ -108,7 +108,7 @@ void cBioGenConstant::InitializeBiomeGen(cIniFile & a_IniFile)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBioGenCache: // cBioGenCache:
cBioGenCache::cBioGenCache(cBiomeGen * a_BioGenToCache, int a_CacheSize) : cBioGenCache::cBioGenCache(cBiomeGen * a_BioGenToCache, int a_CacheSize) :
@ -209,7 +209,7 @@ void cBioGenCache::InitializeBiomeGen(cIniFile & a_IniFile)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBiomeGenList: // cBiomeGenList:
void cBiomeGenList::InitializeBiomes(const AString & a_Biomes) void cBiomeGenList::InitializeBiomes(const AString & a_Biomes)
@ -290,7 +290,7 @@ void cBiomeGenList::InitializeBiomes(const AString & a_Biomes)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBioGenCheckerboard: // cBioGenCheckerboard:
void cBioGenCheckerboard::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) void cBioGenCheckerboard::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap)
@ -324,7 +324,7 @@ void cBioGenCheckerboard::InitializeBiomeGen(cIniFile & a_IniFile)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBioGenVoronoi : // cBioGenVoronoi :
void cBioGenVoronoi::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) void cBioGenVoronoi::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap)
@ -357,7 +357,7 @@ void cBioGenVoronoi::InitializeBiomeGen(cIniFile & a_IniFile)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBioGenDistortedVoronoi: // cBioGenDistortedVoronoi:
void cBioGenDistortedVoronoi::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap) void cBioGenDistortedVoronoi::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_BiomeMap)
@ -418,7 +418,7 @@ void cBioGenDistortedVoronoi::Distort(int a_BlockX, int a_BlockZ, int & a_Distor
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBioGenMultiStepMap : // cBioGenMultiStepMap :
cBioGenMultiStepMap::cBioGenMultiStepMap(int a_Seed) : cBioGenMultiStepMap::cBioGenMultiStepMap(int a_Seed) :
@ -739,7 +739,7 @@ void cBioGenMultiStepMap::FreezeWaterBiomes(cChunkDef::BiomeMap & a_BiomeMap, co
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBioGenTwoLevel: // cBioGenTwoLevel:
cBioGenTwoLevel::cBioGenTwoLevel(int a_Seed) : cBioGenTwoLevel::cBioGenTwoLevel(int a_Seed) :

10
src/Generating/Caves.cpp
View File

@ -151,7 +151,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCaveTunnel: // cCaveTunnel:
cCaveTunnel::cCaveTunnel( cCaveTunnel::cCaveTunnel(
@ -571,7 +571,7 @@ AString cCaveTunnel::ExportAsSVG(int a_Color, int a_OffsetX, int a_OffsetZ) cons
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenWormNestCaves::cCaveSystem: // cStructGenWormNestCaves::cCaveSystem:
cStructGenWormNestCaves::cCaveSystem::cCaveSystem(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_MaxOffset, int a_Size, cNoise & a_Noise) : cStructGenWormNestCaves::cCaveSystem::cCaveSystem(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_MaxOffset, int a_Size, cNoise & a_Noise) :
@ -687,7 +687,7 @@ int cStructGenWormNestCaves::cCaveSystem::GetRadius(cNoise & a_Noise, int a_Orig
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenWormNestCaves: // cStructGenWormNestCaves:
cGridStructGen::cStructurePtr cStructGenWormNestCaves::CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) cGridStructGen::cStructurePtr cStructGenWormNestCaves::CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ)
@ -700,7 +700,7 @@ cGridStructGen::cStructurePtr cStructGenWormNestCaves::CreateStructure(int a_Gri
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenMarbleCaves: // cStructGenMarbleCaves:
static float GetMarbleNoise( float x, float y, float z, cNoise & a_Noise ) static float GetMarbleNoise( float x, float y, float z, cNoise & a_Noise )
@ -752,7 +752,7 @@ void cStructGenMarbleCaves::GenFinish(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenDualRidgeCaves: // cStructGenDualRidgeCaves:
void cStructGenDualRidgeCaves::GenFinish(cChunkDesc & a_ChunkDesc) void cStructGenDualRidgeCaves::GenFinish(cChunkDesc & a_ChunkDesc)

4
src/Generating/ChunkGenerator.cpp
View File

@ -22,7 +22,7 @@ const unsigned int QUEUE_SKIP_LIMIT = 500;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cChunkGenerator: // cChunkGenerator:
cChunkGenerator::cChunkGenerator(void) : cChunkGenerator::cChunkGenerator(void) :
@ -290,7 +290,7 @@ void cChunkGenerator::DoGenerate(int a_ChunkX, int a_ChunkY, int a_ChunkZ)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cChunkGenerator::cGenerator: // cChunkGenerator::cGenerator:
cChunkGenerator::cGenerator::cGenerator(cChunkGenerator & a_ChunkGenerator) : cChunkGenerator::cGenerator::cGenerator(cChunkGenerator & a_ChunkGenerator) :

12
src/Generating/CompoGen.cpp
View File

@ -18,7 +18,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompoGenSameBlock: // cCompoGenSameBlock:
void cCompoGenSameBlock::ComposeTerrain(cChunkDesc & a_ChunkDesc) void cCompoGenSameBlock::ComposeTerrain(cChunkDesc & a_ChunkDesc)
@ -60,7 +60,7 @@ void cCompoGenSameBlock::InitializeCompoGen(cIniFile & a_IniFile)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompoGenDebugBiomes: // cCompoGenDebugBiomes:
void cCompoGenDebugBiomes::ComposeTerrain(cChunkDesc & a_ChunkDesc) void cCompoGenDebugBiomes::ComposeTerrain(cChunkDesc & a_ChunkDesc)
@ -111,7 +111,7 @@ void cCompoGenDebugBiomes::ComposeTerrain(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompoGenClassic: // cCompoGenClassic:
cCompoGenClassic::cCompoGenClassic(void) : cCompoGenClassic::cCompoGenClassic(void) :
@ -209,7 +209,7 @@ void cCompoGenClassic::InitializeCompoGen(cIniFile & a_IniFile)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompoGenBiomal: // cCompoGenBiomal:
void cCompoGenBiomal::ComposeTerrain(cChunkDesc & a_ChunkDesc) void cCompoGenBiomal::ComposeTerrain(cChunkDesc & a_ChunkDesc)
@ -526,7 +526,7 @@ void cCompoGenBiomal::FillColumnPattern(int a_RelX, int a_RelZ, int a_Height, cC
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompoGenNether: // cCompoGenNether:
cCompoGenNether::cCompoGenNether(int a_Seed) : cCompoGenNether::cCompoGenNether(int a_Seed) :
@ -645,7 +645,7 @@ void cCompoGenNether::InitializeCompoGen(cIniFile & a_IniFile)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCompoGenCache: // cCompoGenCache:
cCompoGenCache::cCompoGenCache(cTerrainCompositionGen & a_Underlying, int a_CacheSize) : cCompoGenCache::cCompoGenCache(cTerrainCompositionGen & a_Underlying, int a_CacheSize) :

4
src/Generating/ComposableGenerator.cpp
View File

@ -34,7 +34,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cTerrainCompositionGen: // cTerrainCompositionGen:
cTerrainCompositionGen * cTerrainCompositionGen::CreateCompositionGen(cIniFile & a_IniFile, cBiomeGen & a_BiomeGen, cTerrainHeightGen & a_HeightGen, int a_Seed) cTerrainCompositionGen * cTerrainCompositionGen::CreateCompositionGen(cIniFile & a_IniFile, cBiomeGen & a_BiomeGen, cTerrainHeightGen & a_HeightGen, int a_Seed)
@ -114,7 +114,7 @@ cTerrainCompositionGen * cTerrainCompositionGen::CreateCompositionGen(cIniFile &
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cComposableGenerator: // cComposableGenerator:
cComposableGenerator::cComposableGenerator(cChunkGenerator & a_ChunkGenerator) : cComposableGenerator::cComposableGenerator(cChunkGenerator & a_ChunkGenerator) :

10
src/Generating/DistortedHeightmap.cpp
View File

@ -14,7 +14,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cPattern: // cPattern:
/// This class is used to store a column pattern initialized at runtime, /// This class is used to store a column pattern initialized at runtime,
@ -50,7 +50,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// The arrays to use for the top block pattern definitions: // The arrays to use for the top block pattern definitions:
static cDistortedHeightmap::sBlockInfo tbGrass[] = static cDistortedHeightmap::sBlockInfo tbGrass[] =
@ -119,7 +119,7 @@ static cDistortedHeightmap::sBlockInfo tbStone[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Ocean floor pattern top-block definitions: // Ocean floor pattern top-block definitions:
static cDistortedHeightmap::sBlockInfo tbOFSand[] = static cDistortedHeightmap::sBlockInfo tbOFSand[] =
@ -151,7 +151,7 @@ static cDistortedHeightmap::sBlockInfo tbOFRedSand[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Individual patterns to use: // Individual patterns to use:
static cPattern patGrass (tbGrass, ARRAYCOUNT(tbGrass)); static cPattern patGrass (tbGrass, ARRAYCOUNT(tbGrass));
@ -171,7 +171,7 @@ static cPattern patOFRedSand(tbOFRedSand, ARRAYCOUNT(tbOFRedSand));
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cDistortedHeightmap: // cDistortedHeightmap:
/** This table assigns a relative maximum overhang size in each direction to biomes. /** This table assigns a relative maximum overhang size in each direction to biomes.

2
src/Generating/EndGen.cpp
View File

@ -29,7 +29,7 @@ enum
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEndGen: // cEndGen:
cEndGen::cEndGen(int a_Seed) : cEndGen::cEndGen(int a_Seed) :

16
src/Generating/FinishGen.cpp
View File

@ -40,7 +40,7 @@ static inline bool IsWater(BLOCKTYPE a_BlockType)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFinishGenNetherClumpFoliage: // cFinishGenNetherClumpFoliage:
void cFinishGenNetherClumpFoliage::GenFinish(cChunkDesc & a_ChunkDesc) void cFinishGenNetherClumpFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
@ -159,7 +159,7 @@ void cFinishGenNetherClumpFoliage::TryPlaceClump(cChunkDesc & a_ChunkDesc, int a
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFinishGenSprinkleFoliage: // cFinishGenSprinkleFoliage:
bool cFinishGenSprinkleFoliage::TryAddSugarcane(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ) bool cFinishGenSprinkleFoliage::TryAddSugarcane(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ)
@ -309,7 +309,7 @@ void cFinishGenSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFinishGenSnow: // cFinishGenSnow:
void cFinishGenSnow::GenFinish(cChunkDesc & a_ChunkDesc) void cFinishGenSnow::GenFinish(cChunkDesc & a_ChunkDesc)
@ -345,7 +345,7 @@ void cFinishGenSnow::GenFinish(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFinishGenIce: // cFinishGenIce:
void cFinishGenIce::GenFinish(cChunkDesc & a_ChunkDesc) void cFinishGenIce::GenFinish(cChunkDesc & a_ChunkDesc)
@ -385,7 +385,7 @@ void cFinishGenIce::GenFinish(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFinishGenLilypads: // cFinishGenLilypads:
int cFinishGenSingleBiomeSingleTopBlock::GetNumToGen(const cChunkDef::BiomeMap & a_BiomeMap) int cFinishGenSingleBiomeSingleTopBlock::GetNumToGen(const cChunkDef::BiomeMap & a_BiomeMap)
@ -447,7 +447,7 @@ void cFinishGenSingleBiomeSingleTopBlock::GenFinish(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFinishGenBottomLava: // cFinishGenBottomLava:
void cFinishGenBottomLava::GenFinish(cChunkDesc & a_ChunkDesc) void cFinishGenBottomLava::GenFinish(cChunkDesc & a_ChunkDesc)
@ -470,7 +470,7 @@ void cFinishGenBottomLava::GenFinish(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFinishGenPreSimulator: // cFinishGenPreSimulator:
cFinishGenPreSimulator::cFinishGenPreSimulator(void) cFinishGenPreSimulator::cFinishGenPreSimulator(void)
@ -637,7 +637,7 @@ void cFinishGenPreSimulator::StationarizeFluid(
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFinishGenFluidSprings: // cFinishGenFluidSprings:
cFinishGenFluidSprings::cFinishGenFluidSprings(int a_Seed, BLOCKTYPE a_Fluid, cIniFile & a_IniFile, eDimension a_Dimension) : cFinishGenFluidSprings::cFinishGenFluidSprings(int a_Seed, BLOCKTYPE a_Fluid, cIniFile & a_IniFile, eDimension a_Dimension) :

2
src/Generating/GridStructGen.cpp
View File

@ -9,7 +9,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEmptyStructure: // cEmptyStructure:
/** A cStructure descendant representing an empty structure. /** A cStructure descendant representing an empty structure.

12
src/Generating/HeiGen.cpp
View File

@ -16,7 +16,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cTerrainHeightGen: // cTerrainHeightGen:
cTerrainHeightGen * cTerrainHeightGen::CreateHeightGen(cIniFile &a_IniFile, cBiomeGen & a_BiomeGen, int a_Seed, bool & a_CacheOffByDefault) cTerrainHeightGen * cTerrainHeightGen::CreateHeightGen(cIniFile &a_IniFile, cBiomeGen & a_BiomeGen, int a_Seed, bool & a_CacheOffByDefault)
@ -91,7 +91,7 @@ cTerrainHeightGen * cTerrainHeightGen::CreateHeightGen(cIniFile &a_IniFile, cBio
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cHeiGenFlat: // cHeiGenFlat:
void cHeiGenFlat::GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap) void cHeiGenFlat::GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap)
@ -115,7 +115,7 @@ void cHeiGenFlat::InitializeHeightGen(cIniFile & a_IniFile)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cHeiGenCache: // cHeiGenCache:
cHeiGenCache::cHeiGenCache(cTerrainHeightGen & a_HeiGenToCache, int a_CacheSize) : cHeiGenCache::cHeiGenCache(cTerrainHeightGen & a_HeiGenToCache, int a_CacheSize) :
@ -234,7 +234,7 @@ bool cHeiGenCache::GetHeightAt(int a_ChunkX, int a_ChunkZ, int a_RelX, int a_Rel
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cHeiGenClassic: // cHeiGenClassic:
cHeiGenClassic::cHeiGenClassic(int a_Seed) : cHeiGenClassic::cHeiGenClassic(int a_Seed) :
@ -306,7 +306,7 @@ void cHeiGenClassic::InitializeHeightGen(cIniFile & a_IniFile)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cHeiGenMountains: // cHeiGenMountains:
cHeiGenMountains::cHeiGenMountains(int a_Seed) : cHeiGenMountains::cHeiGenMountains(int a_Seed) :
@ -368,7 +368,7 @@ void cHeiGenMountains::InitializeHeightGen(cIniFile & a_IniFile)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cHeiGenBiomal: // cHeiGenBiomal:
const cHeiGenBiomal::sGenParam cHeiGenBiomal::m_GenParam[256] = const cHeiGenBiomal::sGenParam cHeiGenBiomal::m_GenParam[256] =

12
src/Generating/MineShafts.cpp
View File

@ -275,7 +275,7 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenMineShafts::cMineShaftSystem: // cStructGenMineShafts::cMineShaftSystem:
cStructGenMineShafts::cMineShaftSystem::cMineShaftSystem( cStructGenMineShafts::cMineShaftSystem::cMineShaftSystem(
@ -400,7 +400,7 @@ bool cStructGenMineShafts::cMineShaftSystem::CanAppend(const cCuboid & a_Boundin
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cMineShaftDirtRoom: // cMineShaftDirtRoom:
cMineShaftDirtRoom::cMineShaftDirtRoom(cStructGenMineShafts::cMineShaftSystem & a_Parent, cNoise & a_Noise) : cMineShaftDirtRoom::cMineShaftDirtRoom(cStructGenMineShafts::cMineShaftSystem & a_Parent, cNoise & a_Noise) :
@ -492,7 +492,7 @@ void cMineShaftDirtRoom::ProcessChunk(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cMineShaftCorridor: // cMineShaftCorridor:
cMineShaftCorridor::cMineShaftCorridor( cMineShaftCorridor::cMineShaftCorridor(
@ -964,7 +964,7 @@ void cMineShaftCorridor::PlaceTorches(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cMineShaftCrossing: // cMineShaftCrossing:
cMineShaftCrossing::cMineShaftCrossing(cStructGenMineShafts::cMineShaftSystem & a_ParentSystem, const cCuboid & a_BoundingBox) : cMineShaftCrossing::cMineShaftCrossing(cStructGenMineShafts::cMineShaftSystem & a_ParentSystem, const cCuboid & a_BoundingBox) :
@ -1100,7 +1100,7 @@ void cMineShaftCrossing::ProcessChunk(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cMineShaftStaircase: // cMineShaftStaircase:
cMineShaftStaircase::cMineShaftStaircase( cMineShaftStaircase::cMineShaftStaircase(
@ -1278,7 +1278,7 @@ void cMineShaftStaircase::ProcessChunk(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenMineShafts: // cStructGenMineShafts:
cStructGenMineShafts::cStructGenMineShafts( cStructGenMineShafts::cStructGenMineShafts(

6
src/Generating/NetherFortGen.cpp
View File

@ -11,7 +11,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cNetherFortGen::cNetherFort: // cNetherFortGen::cNetherFort:
class cNetherFortGen::cNetherFort : class cNetherFortGen::cNetherFort :
@ -65,7 +65,7 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Performance test of the NetherFort generator: // Performance test of the NetherFort generator:
/* /*
@ -99,7 +99,7 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cNetherFortGen: // cNetherFortGen:
cPrefabPiecePool cNetherFortGen::m_PiecePool(g_NetherFortPrefabs, g_NetherFortPrefabsCount, g_NetherFortStartingPrefabs, g_NetherFortStartingPrefabsCount); cPrefabPiecePool cNetherFortGen::m_PiecePool(g_NetherFortPrefabs, g_NetherFortPrefabsCount, g_NetherFortStartingPrefabs, g_NetherFortStartingPrefabsCount);

4
src/Generating/Noise3DGenerator.cpp
View File

@ -61,7 +61,7 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cNoise3DGenerator: // cNoise3DGenerator:
cNoise3DGenerator::cNoise3DGenerator(cChunkGenerator & a_ChunkGenerator) : cNoise3DGenerator::cNoise3DGenerator(cChunkGenerator & a_ChunkGenerator) :
@ -342,7 +342,7 @@ void cNoise3DGenerator::ComposeTerrain(cChunkDesc & a_ChunkDesc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cNoise3DComposable: // cNoise3DComposable:
cNoise3DComposable::cNoise3DComposable(int a_Seed) : cNoise3DComposable::cNoise3DComposable(int a_Seed) :

2
src/Generating/POCPieceGenerator.cpp
View File

@ -150,7 +150,7 @@ static void DebugPieces(const cPlacedPieces & a_Pieces)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cPOCPieceGenerator: // cPOCPieceGenerator:
cPOCPieceGenerator::cPOCPieceGenerator(int a_Seed) : cPOCPieceGenerator::cPOCPieceGenerator(int a_Seed) :

16
src/Generating/PieceGenerator.cpp
View File

@ -13,7 +13,7 @@
#ifdef SELF_TEST #ifdef SELF_TEST
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Self-test: // Self-test:
static class cPieceGeneratorSelfTest : static class cPieceGeneratorSelfTest :
@ -140,7 +140,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cPiece: // cPiece:
@ -254,7 +254,7 @@ cCuboid cPiece::RotateMoveHitBox(int a_NumCCWRotations, int a_MoveX, int a_MoveY
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cPiece::cConnector: // cPiece::cConnector:
cPiece::cConnector::cConnector(int a_X, int a_Y, int a_Z, int a_Type, eBlockFace a_Direction) : cPiece::cConnector::cConnector(int a_X, int a_Y, int a_Z, int a_Type, eBlockFace a_Direction) :
@ -279,7 +279,7 @@ cPiece::cConnector::cConnector(const Vector3i & a_Pos, int a_Type, eBlockFace a_
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cPlacedPiece: // cPlacedPiece:
cPlacedPiece::cPlacedPiece(const cPlacedPiece * a_Parent, const cPiece & a_Piece, const Vector3i & a_Coords, int a_NumCCWRotations) : cPlacedPiece::cPlacedPiece(const cPlacedPiece * a_Parent, const cPiece & a_Piece, const Vector3i & a_Coords, int a_NumCCWRotations) :
@ -328,7 +328,7 @@ void cPlacedPiece::MoveToGroundBy(int a_OffsetY)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cPieceGenerator: // cPieceGenerator:
cPieceGenerator::cPieceGenerator(cPiecePool & a_PiecePool, int a_Seed) : cPieceGenerator::cPieceGenerator(cPiecePool & a_PiecePool, int a_Seed) :
@ -578,7 +578,7 @@ void cPieceGenerator::DebugConnectorPool(const cPieceGenerator::cFreeConnectors
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cPieceGenerator::cConnection: // cPieceGenerator::cConnection:
cPieceGenerator::cConnection::cConnection(cPiece & a_Piece, cPiece::cConnector & a_Connector, int a_NumCCWRotations, int a_Weight) : cPieceGenerator::cConnection::cConnection(cPiece & a_Piece, cPiece::cConnector & a_Connector, int a_NumCCWRotations, int a_Weight) :
@ -593,7 +593,7 @@ cPieceGenerator::cConnection::cConnection(cPiece & a_Piece, cPiece::cConnector &
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cPieceGenerator::cFreeConnector: // cPieceGenerator::cFreeConnector:
cPieceGenerator::cFreeConnector::cFreeConnector(cPlacedPiece * a_Piece, const cPiece::cConnector & a_Connector) : cPieceGenerator::cFreeConnector::cFreeConnector(cPlacedPiece * a_Piece, const cPiece::cConnector & a_Connector) :
@ -606,7 +606,7 @@ cPieceGenerator::cFreeConnector::cFreeConnector(cPlacedPiece * a_Piece, const cP
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cBFSPieceGenerator: // cBFSPieceGenerator:
cBFSPieceGenerator::cBFSPieceGenerator(cPiecePool & a_PiecePool, int a_Seed) : cBFSPieceGenerator::cBFSPieceGenerator(cPiecePool & a_PiecePool, int a_Seed) :

40
src/Generating/Prefabs/AlchemistVillagePrefabs.cpp
View File

@ -15,7 +15,7 @@
const cPrefab::sDef g_AlchemistVillagePrefabs[] = const cPrefab::sDef g_AlchemistVillagePrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BarWithBasement: // BarWithBasement:
// The data has been exported from the gallery Desert, area index 82, ID 598, created by STR_Warrior // The data has been exported from the gallery Desert, area index 82, ID 598, created by STR_Warrior
{ {
@ -264,7 +264,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BarWithoutBasement: // BarWithoutBasement:
// The data has been exported from the gallery Desert, area index 81, ID 597, created by STR_Warrior // The data has been exported from the gallery Desert, area index 81, ID 597, created by STR_Warrior
{ {
@ -463,7 +463,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BlackSmith: // BlackSmith:
// The data has been exported from the gallery Desert, area index 97, ID 642, created by STR_Warrior // The data has been exported from the gallery Desert, area index 97, ID 642, created by STR_Warrior
{ {
@ -633,7 +633,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LargeHouse1: // LargeHouse1:
// The data has been exported from the gallery Desert, area index 77, ID 577, created by STR_Warrior // The data has been exported from the gallery Desert, area index 77, ID 577, created by STR_Warrior
{ {
@ -922,7 +922,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LargeTower: // LargeTower:
// The data has been exported from the gallery Desert, area index 80, ID 596, created by STR_Warrior // The data has been exported from the gallery Desert, area index 80, ID 596, created by STR_Warrior
{ {
@ -1108,7 +1108,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LittleHouse: // LittleHouse:
// The data has been exported from the gallery Desert, area index 65, ID 551, created by STR_Warrior // The data has been exported from the gallery Desert, area index 65, ID 551, created by STR_Warrior
{ {
@ -1229,7 +1229,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LittleHouse2: // LittleHouse2:
// The data has been exported from the gallery Desert, area index 72, ID 562, created by STR_Warrior // The data has been exported from the gallery Desert, area index 72, ID 562, created by STR_Warrior
{ {
@ -1376,7 +1376,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LittleHouse3: // LittleHouse3:
// The data has been exported from the gallery Desert, area index 66, ID 553, created by STR_Warrior // The data has been exported from the gallery Desert, area index 66, ID 553, created by STR_Warrior
{ {
@ -1496,7 +1496,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LittleHouse4: // LittleHouse4:
// The data has been exported from the gallery Desert, area index 70, ID 560, created by STR_Warrior // The data has been exported from the gallery Desert, area index 70, ID 560, created by STR_Warrior
{ {
@ -1647,7 +1647,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LittleHouse5: // LittleHouse5:
// The data has been exported from the gallery Desert, area index 68, ID 558, created by STR_Warrior // The data has been exported from the gallery Desert, area index 68, ID 558, created by STR_Warrior
{ {
@ -1781,7 +1781,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LittleHouse6: // LittleHouse6:
// The data has been exported from the gallery Desert, area index 69, ID 559, created by STR_Warrior // The data has been exported from the gallery Desert, area index 69, ID 559, created by STR_Warrior
{ {
@ -1922,7 +1922,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LittleHouse7: // LittleHouse7:
// The data has been exported from the gallery Desert, area index 73, ID 563, created by xoft // The data has been exported from the gallery Desert, area index 73, ID 563, created by xoft
{ {
@ -2068,7 +2068,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LittleHouse8: // LittleHouse8:
// The data has been exported from the gallery Desert, area index 99, ID 739, created by STR_Warrior // The data has been exported from the gallery Desert, area index 99, ID 739, created by STR_Warrior
{ {
@ -2200,7 +2200,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LittleTower: // LittleTower:
// The data has been exported from the gallery Desert, area index 79, ID 595, created by STR_Warrior // The data has been exported from the gallery Desert, area index 79, ID 595, created by STR_Warrior
{ {
@ -2351,7 +2351,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MediumHouse1: // MediumHouse1:
// The data has been exported from the gallery Desert, area index 71, ID 561, created by STR_Warrior // The data has been exported from the gallery Desert, area index 71, ID 561, created by STR_Warrior
{ {
@ -2531,7 +2531,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MediumHouse2: // MediumHouse2:
// The data has been exported from the gallery Desert, area index 74, ID 573, created by STR_Warrior // The data has been exported from the gallery Desert, area index 74, ID 573, created by STR_Warrior
{ {
@ -2740,7 +2740,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MediumHouse3: // MediumHouse3:
// The data has been exported from the gallery Desert, area index 76, ID 575, created by STR_Warrior // The data has been exported from the gallery Desert, area index 76, ID 575, created by STR_Warrior
{ {
@ -2958,7 +2958,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// SmallHouse9: // SmallHouse9:
// The data has been exported from the gallery Desert, area index 67, ID 556, created by STR_Warrior // The data has been exported from the gallery Desert, area index 67, ID 556, created by STR_Warrior
{ {
@ -3104,7 +3104,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Temple: // Temple:
// The data has been exported from the gallery Desert, area index 83, ID 599, created by STR_Warrior // The data has been exported from the gallery Desert, area index 83, ID 599, created by STR_Warrior
{ {
@ -3310,7 +3310,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
const cPrefab::sDef g_AlchemistVillageStartingPrefabs[] = const cPrefab::sDef g_AlchemistVillageStartingPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Well: // Well:
// The data has been exported from the gallery Desert, area index 90, ID 631, created by STR_Warrior // The data has been exported from the gallery Desert, area index 90, ID 631, created by STR_Warrior
{ {

38
src/Generating/Prefabs/JapaneseVillagePrefabs.cpp
View File

@ -15,7 +15,7 @@
const cPrefab::sDef g_JapaneseVillagePrefabs[] = const cPrefab::sDef g_JapaneseVillagePrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Arch: // Arch:
// The data has been exported from the gallery Plains, area index 144, ID 488, created by Aloe_vera // The data has been exported from the gallery Plains, area index 144, ID 488, created by Aloe_vera
{ {
@ -129,7 +129,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Farm: // Farm:
// The data has been exported from the gallery Plains, area index 166, ID 554, created by Aloe_vera // The data has been exported from the gallery Plains, area index 166, ID 554, created by Aloe_vera
{ {
@ -299,7 +299,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Forge: // Forge:
// The data has been exported from the gallery Plains, area index 79, ID 145, created by Aloe_vera // The data has been exported from the gallery Plains, area index 79, ID 145, created by Aloe_vera
{ {
@ -565,7 +565,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Garden2: // Garden2:
// The data has been exported from the gallery Plains, area index 147, ID 491, created by Aloe_vera // The data has been exported from the gallery Plains, area index 147, ID 491, created by Aloe_vera
{ {
@ -717,7 +717,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseMid: // HouseMid:
// The data has been exported from the gallery Plains, area index 62, ID 119, created by Aloe_vera // The data has been exported from the gallery Plains, area index 62, ID 119, created by Aloe_vera
{ {
@ -893,7 +893,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseSmall: // HouseSmall:
// The data has been exported from the gallery Plains, area index 68, ID 131, created by Aloe_vera // The data has been exported from the gallery Plains, area index 68, ID 131, created by Aloe_vera
{ {
@ -1004,7 +1004,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseSmallDblWithDoor: // HouseSmallDblWithDoor:
// The data has been exported from the gallery Plains, area index 113, ID 265, created by Aloe_vera // The data has been exported from the gallery Plains, area index 113, ID 265, created by Aloe_vera
{ {
@ -1128,7 +1128,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseSmallDouble: // HouseSmallDouble:
// The data has been exported from the gallery Plains, area index 72, ID 135, created by Aloe_vera // The data has been exported from the gallery Plains, area index 72, ID 135, created by Aloe_vera
{ {
@ -1249,7 +1249,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseSmallWithDoor: // HouseSmallWithDoor:
// The data has been exported from the gallery Plains, area index 112, ID 264, created by Aloe_vera // The data has been exported from the gallery Plains, area index 112, ID 264, created by Aloe_vera
{ {
@ -1362,7 +1362,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseWide: // HouseWide:
// The data has been exported from the gallery Plains, area index 64, ID 121, created by STR_Warrior // The data has been exported from the gallery Plains, area index 64, ID 121, created by STR_Warrior
{ {
@ -1510,7 +1510,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseWithGarden: // HouseWithGarden:
// The data has been exported from the gallery Plains, area index 67, ID 130, created by Aloe_vera // The data has been exported from the gallery Plains, area index 67, ID 130, created by Aloe_vera
{ {
@ -1756,7 +1756,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseWithSakura1: // HouseWithSakura1:
// The data has been exported from the gallery Plains, area index 75, ID 141, created by Aloe_vera // The data has been exported from the gallery Plains, area index 75, ID 141, created by Aloe_vera
{ {
@ -1950,7 +1950,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseWithSpa: // HouseWithSpa:
// The data has been exported from the gallery Plains, area index 73, ID 139, created by Aloe_vera // The data has been exported from the gallery Plains, area index 73, ID 139, created by Aloe_vera
{ {
@ -2158,7 +2158,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MediumSakuraTree: // MediumSakuraTree:
// The data has been exported from the gallery Plains, area index 146, ID 490, created by STR_Warrior // The data has been exported from the gallery Plains, area index 146, ID 490, created by STR_Warrior
{ {
@ -2312,7 +2312,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Restaurant: // Restaurant:
// The data has been exported from the gallery Plains, area index 61, ID 117, created by Aloe_vera // The data has been exported from the gallery Plains, area index 61, ID 117, created by Aloe_vera
{ {
@ -2566,7 +2566,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// SakuraDouble: // SakuraDouble:
// The data has been exported from the gallery Plains, area index 76, ID 142, created by Aloe_vera // The data has been exported from the gallery Plains, area index 76, ID 142, created by Aloe_vera
{ {
@ -2697,7 +2697,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// SakuraSmall: // SakuraSmall:
// The data has been exported from the gallery Plains, area index 145, ID 489, created by Aloe_vera // The data has been exported from the gallery Plains, area index 145, ID 489, created by Aloe_vera
{ {
@ -2808,7 +2808,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
const cPrefab::sDef g_JapaneseVillageStartingPrefabs[] = const cPrefab::sDef g_JapaneseVillageStartingPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HighTemple: // HighTemple:
// The data has been exported from the gallery Plains, area index 70, ID 133, created by Aloe_vera // The data has been exported from the gallery Plains, area index 70, ID 133, created by Aloe_vera
{ {
@ -3159,7 +3159,7 @@ const cPrefab::sDef g_JapaneseVillageStartingPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Well: // Well:
// The data has been exported from the gallery Plains, area index 143, ID 487, created by STR_Warrior // The data has been exported from the gallery Plains, area index 143, ID 487, created by STR_Warrior
{ {

68
src/Generating/Prefabs/NetherFortPrefabs.cpp
View File

@ -15,7 +15,7 @@
const cPrefab::sDef g_NetherFortPrefabs[] = const cPrefab::sDef g_NetherFortPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BalconyCorridor: // BalconyCorridor:
// The data has been exported from the gallery Nether, area index 37, ID 288, created by Aloe_vera // The data has been exported from the gallery Nether, area index 37, ID 288, created by Aloe_vera
{ {
@ -162,7 +162,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BalconyTee2: // BalconyTee2:
// The data has been exported from the gallery Nether, area index 38, ID 289, created by Aloe_vera // The data has been exported from the gallery Nether, area index 38, ID 289, created by Aloe_vera
{ {
@ -325,7 +325,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BlazePlatform: // BlazePlatform:
// The data has been exported from the gallery Nether, area index 26, ID 276, created by tonibm1999 // The data has been exported from the gallery Nether, area index 26, ID 276, created by tonibm1999
{ {
@ -448,7 +448,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BlazePlatformOverhang: // BlazePlatformOverhang:
// The data has been exported from the gallery Nether, area index 20, ID 162, created by STR_Warrior // The data has been exported from the gallery Nether, area index 20, ID 162, created by STR_Warrior
{ {
@ -621,7 +621,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BridgeCircleCrossing: // BridgeCircleCrossing:
// The data has been exported from the gallery Nether, area index 49, ID 308, created by Aloe_vera // The data has been exported from the gallery Nether, area index 49, ID 308, created by Aloe_vera
{ {
@ -824,7 +824,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BridgeCrossing: // BridgeCrossing:
// The data has been exported from the gallery Nether, area index 17, ID 159, created by Aloe_vera // The data has been exported from the gallery Nether, area index 17, ID 159, created by Aloe_vera
{ {
@ -1028,7 +1028,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BridgeCrumble1: // BridgeCrumble1:
// The data has been exported from the gallery Nether, area index 19, ID 161, created by Aloe_vera // The data has been exported from the gallery Nether, area index 19, ID 161, created by Aloe_vera
{ {
@ -1125,7 +1125,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BridgeCrumble2: // BridgeCrumble2:
// The data has been exported from the gallery Nether, area index 18, ID 160, created by Aloe_vera // The data has been exported from the gallery Nether, area index 18, ID 160, created by Aloe_vera
{ {
@ -1228,7 +1228,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BridgeDoubleCrumble: // BridgeDoubleCrumble:
// The data has been exported from the gallery Nether, area index 46, ID 305, created by STR_Warrior // The data has been exported from the gallery Nether, area index 46, ID 305, created by STR_Warrior
{ {
@ -1410,7 +1410,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BridgeFunnelDown: // BridgeFunnelDown:
// The data has been exported from the gallery Nether, area index 0, ID 2, created by Aloe_vera // The data has been exported from the gallery Nether, area index 0, ID 2, created by Aloe_vera
{ {
@ -1653,7 +1653,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BridgeLevelCrossing: // BridgeLevelCrossing:
// The data has been exported from the gallery Nether, area index 61, ID 321, created by Aloe_vera // The data has been exported from the gallery Nether, area index 61, ID 321, created by Aloe_vera
{ {
@ -1985,7 +1985,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BridgeSegment: // BridgeSegment:
// The data has been exported from the gallery Nether, area index 16, ID 158, created by Aloe_vera // The data has been exported from the gallery Nether, area index 16, ID 158, created by Aloe_vera
{ {
@ -2107,7 +2107,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BridgeTee: // BridgeTee:
// The data has been exported from the gallery Nether, area index 39, ID 290, created by STR_Warrior // The data has been exported from the gallery Nether, area index 39, ID 290, created by STR_Warrior
{ {
@ -2270,7 +2270,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Corridor11: // Corridor11:
// The data has been exported from the gallery Nether, area index 36, ID 287, created by Aloe_vera // The data has been exported from the gallery Nether, area index 36, ID 287, created by Aloe_vera
{ {
@ -2374,7 +2374,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Corridor13: // Corridor13:
// The data has been exported from the gallery Nether, area index 35, ID 286, created by Aloe_vera // The data has been exported from the gallery Nether, area index 35, ID 286, created by Aloe_vera
{ {
@ -2478,7 +2478,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Corridor5: // Corridor5:
// The data has been exported from the gallery Nether, area index 65, ID 330, created by xoft // The data has been exported from the gallery Nether, area index 65, ID 330, created by xoft
{ {
@ -2576,7 +2576,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CorridorCorner5: // CorridorCorner5:
// The data has been exported from the gallery Nether, area index 10, ID 40, created by xoft // The data has been exported from the gallery Nether, area index 10, ID 40, created by xoft
{ {
@ -2718,7 +2718,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CorridorCornerChest5: // CorridorCornerChest5:
// The data has been exported from the gallery Nether, area index 42, ID 293, created by STR_Warrior // The data has been exported from the gallery Nether, area index 42, ID 293, created by STR_Warrior
{ {
@ -2861,7 +2861,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CorridorCrossing: // CorridorCrossing:
// The data has been exported from the gallery Nether, area index 63, ID 328, created by xoft // The data has been exported from the gallery Nether, area index 63, ID 328, created by xoft
{ {
@ -2989,7 +2989,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CorridorStairs: // CorridorStairs:
// The data has been exported from the gallery Nether, area index 12, ID 42, created by xoft // The data has been exported from the gallery Nether, area index 12, ID 42, created by xoft
{ {
@ -3144,7 +3144,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// DarkCorridor: // DarkCorridor:
// The data has been exported from the gallery Nether, area index 3, ID 30, created by STR_Warrior // The data has been exported from the gallery Nether, area index 3, ID 30, created by STR_Warrior
{ {
@ -3248,7 +3248,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LavaStaircase: // LavaStaircase:
// The data has been exported from the gallery Nether, area index 28, ID 278, created by Aloe_vera // The data has been exported from the gallery Nether, area index 28, ID 278, created by Aloe_vera
{ {
@ -3508,7 +3508,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LavaStaircaseBig: // LavaStaircaseBig:
// The data has been exported from the gallery Nether, area index 31, ID 282, created by STR_Warrior // The data has been exported from the gallery Nether, area index 31, ID 282, created by STR_Warrior
{ {
@ -3842,7 +3842,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LavaStairsBridge: // LavaStairsBridge:
// The data has been exported from the gallery Nether, area index 30, ID 281, created by STR_Warrior // The data has been exported from the gallery Nether, area index 30, ID 281, created by STR_Warrior
{ {
@ -4123,7 +4123,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MidStaircase: // MidStaircase:
// The data has been exported from the gallery Nether, area index 23, ID 165, created by Aloe_vera // The data has been exported from the gallery Nether, area index 23, ID 165, created by Aloe_vera
{ {
@ -4314,7 +4314,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// StairsToOpen1: // StairsToOpen1:
// The data has been exported from the gallery Nether, area index 27, ID 277, created by Aloe_vera // The data has been exported from the gallery Nether, area index 27, ID 277, created by Aloe_vera
{ {
@ -4460,7 +4460,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// StairsToOpen2: // StairsToOpen2:
// The data has been exported from the gallery Nether, area index 8, ID 35, created by xoft // The data has been exported from the gallery Nether, area index 8, ID 35, created by xoft
{ {
@ -4606,7 +4606,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Tee2x4: // Tee2x4:
// The data has been exported from the gallery Nether, area index 40, ID 291, created by Aloe_vera // The data has been exported from the gallery Nether, area index 40, ID 291, created by Aloe_vera
{ {
@ -4726,7 +4726,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Tee4x4: // Tee4x4:
// The data has been exported from the gallery Nether, area index 41, ID 292, created by Aloe_vera // The data has been exported from the gallery Nether, area index 41, ID 292, created by Aloe_vera
{ {
@ -4858,7 +4858,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// TinyCorridorCorner: // TinyCorridorCorner:
// The data has been exported from the gallery Nether, area index 66, ID 331, created by xoft // The data has been exported from the gallery Nether, area index 66, ID 331, created by xoft
{ {
@ -4957,7 +4957,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// TinyCorridorCornerChest: // TinyCorridorCornerChest:
// The data has been exported from the gallery Nether, area index 67, ID 332, created by Aloe_vera // The data has been exported from the gallery Nether, area index 67, ID 332, created by Aloe_vera
{ {
@ -5057,7 +5057,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// TinyCorridorCrossing: // TinyCorridorCrossing:
// The data has been exported from the gallery Nether, area index 64, ID 329, created by xoft // The data has been exported from the gallery Nether, area index 64, ID 329, created by xoft
{ {
@ -5159,7 +5159,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Turret: // Turret:
// The data has been exported from the gallery Nether, area index 7, ID 34, created by xoft // The data has been exported from the gallery Nether, area index 7, ID 34, created by xoft
{ {
@ -5283,7 +5283,7 @@ const cPrefab::sDef g_NetherFortPrefabs[] =
const cPrefab::sDef g_NetherFortStartingPrefabs[] = const cPrefab::sDef g_NetherFortStartingPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CentralRoom: // CentralRoom:
// The data has been exported from the gallery Nether, area index 22, ID 164, created by Aloe_vera // The data has been exported from the gallery Nether, area index 22, ID 164, created by Aloe_vera
{ {

72
src/Generating/Prefabs/PlainsVillagePrefabs.cpp
View File

@ -15,7 +15,7 @@
const cPrefab::sDef g_PlainsVillagePrefabs[] = const cPrefab::sDef g_PlainsVillagePrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BigPlantBed: // BigPlantBed:
// The data has been exported from the gallery Plains, area index 26, ID 70, created by Taugrammaton // The data has been exported from the gallery Plains, area index 26, ID 70, created by Taugrammaton
{ {
@ -195,7 +195,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CobbleHouse10x5Library: // CobbleHouse10x5Library:
// The data has been exported from the gallery Plains, area index 23, ID 66, created by xoft // The data has been exported from the gallery Plains, area index 23, ID 66, created by xoft
{ {
@ -336,7 +336,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// DoublePlantBed: // DoublePlantBed:
// The data has been exported from the gallery Plains, area index 5, ID 20, created by tonibm1999 // The data has been exported from the gallery Plains, area index 5, ID 20, created by tonibm1999
{ {
@ -492,7 +492,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Forge: // Forge:
// The data has been exported from the gallery Plains, area index 51, ID 102, created by Aloe_vera // The data has been exported from the gallery Plains, area index 51, ID 102, created by Aloe_vera
{ {
@ -692,7 +692,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LampPost: // LampPost:
// The data has been exported from the gallery Plains, area index 28, ID 73, created by STR_Warrior // The data has been exported from the gallery Plains, area index 28, ID 73, created by STR_Warrior
{ {
@ -784,7 +784,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MineshaftCorridor: // MineshaftCorridor:
// The data has been exported from the gallery Plains, area index 139, ID 447, created by STR_Warrior // The data has been exported from the gallery Plains, area index 139, ID 447, created by STR_Warrior
{ {
@ -861,7 +861,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MineshaftCrossing: // MineshaftCrossing:
// The data has been exported from the gallery Plains, area index 171, ID 578, created by Aloe_vera // The data has been exported from the gallery Plains, area index 171, ID 578, created by Aloe_vera
{ {
@ -946,7 +946,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MineshaftCrossing: // MineshaftCrossing:
// The data has been exported from the gallery Plains, area index 193, ID 657, created by Aloe_vera // The data has been exported from the gallery Plains, area index 193, ID 657, created by Aloe_vera
{ {
@ -1064,7 +1064,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MineshaftDoubleCrossing: // MineshaftDoubleCrossing:
// The data has been exported from the gallery Plains, area index 172, ID 579, created by Aloe_vera // The data has been exported from the gallery Plains, area index 172, ID 579, created by Aloe_vera
{ {
@ -1189,7 +1189,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MineshaftSpiral: // MineshaftSpiral:
// The data has been exported from the gallery Plains, area index 198, ID 662, created by Aloe_vera // The data has been exported from the gallery Plains, area index 198, ID 662, created by Aloe_vera
{ {
@ -1370,7 +1370,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MineshaftStairs: // MineshaftStairs:
// The data has been exported from the gallery Plains, area index 195, ID 659, created by Aloe_vera // The data has been exported from the gallery Plains, area index 195, ID 659, created by Aloe_vera
{ {
@ -1469,7 +1469,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MineshaftStairsCrossing: // MineshaftStairsCrossing:
// The data has been exported from the gallery Plains, area index 199, ID 663, created by Aloe_vera // The data has been exported from the gallery Plains, area index 199, ID 663, created by Aloe_vera
{ {
@ -1719,7 +1719,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MineshaftTee: // MineshaftTee:
// The data has been exported from the gallery Plains, area index 194, ID 658, created by Aloe_vera // The data has been exported from the gallery Plains, area index 194, ID 658, created by Aloe_vera
{ {
@ -1819,7 +1819,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MineshaftsCorridor5: // MineshaftsCorridor5:
// The data has been exported from the gallery Plains, area index 200, ID 664, created by Aloe_vera // The data has been exported from the gallery Plains, area index 200, ID 664, created by Aloe_vera
{ {
@ -1898,7 +1898,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Scarecrow: // Scarecrow:
// The data has been exported from the gallery Plains, area index 150, ID 494, created by STR_Warrior // The data has been exported from the gallery Plains, area index 150, ID 494, created by STR_Warrior
{ {
@ -1983,7 +1983,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// SinglePlantBed: // SinglePlantBed:
// The data has been exported from the gallery Plains, area index 17, ID 60, created by Aloe_vera // The data has been exported from the gallery Plains, area index 17, ID 60, created by Aloe_vera
{ {
@ -2108,7 +2108,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenChurchMid: // WoodenChurchMid:
// The data has been exported from the gallery Plains, area index 58, ID 109, created by Aloe_vera // The data has been exported from the gallery Plains, area index 58, ID 109, created by Aloe_vera
{ {
@ -2418,7 +2418,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenGranary: // WoodenGranary:
// The data has been exported from the gallery Plains, area index 54, ID 105, created by Aloe_vera // The data has been exported from the gallery Plains, area index 54, ID 105, created by Aloe_vera
{ {
@ -2560,7 +2560,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouse10x7Library: // WoodenHouse10x7Library:
// The data has been exported from the gallery Plains, area index 47, ID 98, created by Aloe_vera // The data has been exported from the gallery Plains, area index 47, ID 98, created by Aloe_vera
{ {
@ -2729,7 +2729,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouse5x5: // WoodenHouse5x5:
// The data has been exported from the gallery Plains, area index 49, ID 100, created by Aloe_vera // The data has been exported from the gallery Plains, area index 49, ID 100, created by Aloe_vera
{ {
@ -2856,7 +2856,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouse7x5: // WoodenHouse7x5:
// The data has been exported from the gallery Plains, area index 40, ID 91, created by xoft // The data has been exported from the gallery Plains, area index 40, ID 91, created by xoft
{ {
@ -2983,7 +2983,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouse9x5: // WoodenHouse9x5:
// The data has been exported from the gallery Plains, area index 41, ID 92, created by xoft // The data has been exported from the gallery Plains, area index 41, ID 92, created by xoft
{ {
@ -3117,7 +3117,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouse9x5Fence: // WoodenHouse9x5Fence:
// The data has been exported from the gallery Plains, area index 9, ID 26, created by Aloe_vera // The data has been exported from the gallery Plains, area index 9, ID 26, created by Aloe_vera
{ {
@ -3287,7 +3287,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouse9x5Library: // WoodenHouse9x5Library:
// The data has been exported from the gallery Plains, area index 46, ID 97, created by Aloe_vera // The data has been exported from the gallery Plains, area index 46, ID 97, created by Aloe_vera
{ {
@ -3428,7 +3428,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouse9x7: // WoodenHouse9x7:
// The data has been exported from the gallery Plains, area index 52, ID 103, created by Aloe_vera // The data has been exported from the gallery Plains, area index 52, ID 103, created by Aloe_vera
{ {
@ -3590,7 +3590,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouse9x7Butcher: // WoodenHouse9x7Butcher:
// The data has been exported from the gallery Plains, area index 48, ID 99, created by Aloe_vera // The data has been exported from the gallery Plains, area index 48, ID 99, created by Aloe_vera
{ {
@ -3806,7 +3806,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouse9x7DoubleDoor: // WoodenHouse9x7DoubleDoor:
// The data has been exported from the gallery Plains, area index 38, ID 87, created by Aloe_vera // The data has been exported from the gallery Plains, area index 38, ID 87, created by Aloe_vera
{ {
@ -3971,7 +3971,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouseL13x14: // WoodenHouseL13x14:
// The data has been exported from the gallery Plains, area index 39, ID 90, created by STR_Warrior // The data has been exported from the gallery Plains, area index 39, ID 90, created by STR_Warrior
{ {
@ -4223,7 +4223,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouseL14x14: // WoodenHouseL14x14:
// The data has been exported from the gallery Plains, area index 0, ID 4, created by Aloe_vera // The data has been exported from the gallery Plains, area index 0, ID 4, created by Aloe_vera
{ {
@ -4450,7 +4450,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouseL9x9: // WoodenHouseL9x9:
// The data has been exported from the gallery Plains, area index 42, ID 93, created by xoft // The data has been exported from the gallery Plains, area index 42, ID 93, created by xoft
{ {
@ -4619,7 +4619,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenHouseU13x9: // WoodenHouseU13x9:
// The data has been exported from the gallery Plains, area index 43, ID 94, created by xoft // The data has been exported from the gallery Plains, area index 43, ID 94, created by xoft
{ {
@ -4786,7 +4786,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenMill5x5: // WoodenMill5x5:
// The data has been exported from the gallery Plains, area index 60, ID 111, created by Aloe_vera // The data has been exported from the gallery Plains, area index 60, ID 111, created by Aloe_vera
{ {
@ -5121,7 +5121,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WoodenStables: // WoodenStables:
// The data has been exported from the gallery Plains, area index 55, ID 106, created by Aloe_vera // The data has been exported from the gallery Plains, area index 55, ID 106, created by Aloe_vera
{ {
@ -5307,7 +5307,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
const cPrefab::sDef g_PlainsVillageStartingPrefabs[] = const cPrefab::sDef g_PlainsVillageStartingPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CobbleWell4x4: // CobbleWell4x4:
// The data has been exported from the gallery Plains, area index 1, ID 5, created by Aloe_vera // The data has been exported from the gallery Plains, area index 1, ID 5, created by Aloe_vera
{ {
@ -5448,7 +5448,7 @@ const cPrefab::sDef g_PlainsVillageStartingPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MineEntrance: // MineEntrance:
// The data has been exported from the gallery Plains, area index 138, ID 446, created by STR_Warrior // The data has been exported from the gallery Plains, area index 138, ID 446, created by STR_Warrior
{ {
@ -5897,7 +5897,7 @@ const cPrefab::sDef g_PlainsVillageStartingPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// RoofedWell: // RoofedWell:
// The data has been exported from the gallery Plains, area index 119, ID 271, created by STR_Warrior // The data has been exported from the gallery Plains, area index 119, ID 271, created by STR_Warrior
{ {

24
src/Generating/Prefabs/RainbowRoadPrefabs.cpp
View File

@ -15,7 +15,7 @@
const cPrefab::sDef g_RainbowRoadPrefabs[] = const cPrefab::sDef g_RainbowRoadPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CurveDouble: // CurveDouble:
// The data has been exported from the gallery Cube, area index 89, ID 467, created by Aloe_vera // The data has been exported from the gallery Cube, area index 89, ID 467, created by Aloe_vera
{ {
@ -85,7 +85,7 @@ const cPrefab::sDef g_RainbowRoadPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CurveDownFromTopSingle: // CurveDownFromTopSingle:
// The data has been exported from the gallery Cube, area index 100, ID 478, created by Aloe_vera // The data has been exported from the gallery Cube, area index 100, ID 478, created by Aloe_vera
{ {
@ -255,7 +255,7 @@ const cPrefab::sDef g_RainbowRoadPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CurveSingle: // CurveSingle:
// The data has been exported from the gallery Cube, area index 84, ID 462, created by Aloe_vera // The data has been exported from the gallery Cube, area index 84, ID 462, created by Aloe_vera
{ {
@ -320,7 +320,7 @@ const cPrefab::sDef g_RainbowRoadPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CurveSingleLeft: // CurveSingleLeft:
// The data has been exported from the gallery Cube, area index 97, ID 475, created by Aloe_vera // The data has been exported from the gallery Cube, area index 97, ID 475, created by Aloe_vera
{ {
@ -385,7 +385,7 @@ const cPrefab::sDef g_RainbowRoadPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CurveUpDouble: // CurveUpDouble:
// The data has been exported from the gallery Cube, area index 92, ID 470, created by Aloe_vera // The data has been exported from the gallery Cube, area index 92, ID 470, created by Aloe_vera
{ {
@ -581,7 +581,7 @@ const cPrefab::sDef g_RainbowRoadPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CurveUpSingle: // CurveUpSingle:
// The data has been exported from the gallery Cube, area index 87, ID 465, created by Aloe_vera // The data has been exported from the gallery Cube, area index 87, ID 465, created by Aloe_vera
{ {
@ -751,7 +751,7 @@ const cPrefab::sDef g_RainbowRoadPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// SlopeDownFromTopSingle: // SlopeDownFromTopSingle:
// The data has been exported from the gallery Cube, area index 98, ID 476, created by Aloe_vera // The data has been exported from the gallery Cube, area index 98, ID 476, created by Aloe_vera
{ {
@ -881,7 +881,7 @@ const cPrefab::sDef g_RainbowRoadPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// SlopeUpDouble: // SlopeUpDouble:
// The data has been exported from the gallery Cube, area index 90, ID 468, created by Aloe_vera // The data has been exported from the gallery Cube, area index 90, ID 468, created by Aloe_vera
{ {
@ -1061,7 +1061,7 @@ const cPrefab::sDef g_RainbowRoadPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// SlopeUpSingle: // SlopeUpSingle:
// The data has been exported from the gallery Cube, area index 85, ID 463, created by Aloe_vera // The data has been exported from the gallery Cube, area index 85, ID 463, created by Aloe_vera
{ {
@ -1191,7 +1191,7 @@ const cPrefab::sDef g_RainbowRoadPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// SplitTee: // SplitTee:
// The data has been exported from the gallery Cube, area index 93, ID 471, created by Aloe_vera // The data has been exported from the gallery Cube, area index 93, ID 471, created by Aloe_vera
{ {
@ -1261,7 +1261,7 @@ const cPrefab::sDef g_RainbowRoadPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// StraightDouble: // StraightDouble:
// The data has been exported from the gallery Cube, area index 88, ID 466, created by Aloe_vera // The data has been exported from the gallery Cube, area index 88, ID 466, created by Aloe_vera
{ {
@ -1335,7 +1335,7 @@ const cPrefab::sDef g_RainbowRoadPrefabs[] =
const cPrefab::sDef g_RainbowRoadStartingPrefabs[] = const cPrefab::sDef g_RainbowRoadStartingPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// StraightSingle: // StraightSingle:
// The data has been exported from the gallery Cube, area index 83, ID 461, created by Aloe_vera // The data has been exported from the gallery Cube, area index 83, ID 461, created by Aloe_vera
{ {

24
src/Generating/Prefabs/SandFlatRoofVillagePrefabs.cpp
View File

@ -15,7 +15,7 @@
const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] = const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Forge: // Forge:
// The data has been exported from the gallery Desert, area index 32, ID 173, created by Aloe_vera // The data has been exported from the gallery Desert, area index 32, ID 173, created by Aloe_vera
{ {
@ -162,7 +162,7 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House11x7: // House11x7:
// The data has been exported from the gallery Desert, area index 31, ID 172, created by Aloe_vera // The data has been exported from the gallery Desert, area index 31, ID 172, created by Aloe_vera
{ {
@ -301,7 +301,7 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House5x4: // House5x4:
// The data has been exported from the gallery Desert, area index 25, ID 166, created by Aloe_vera // The data has been exported from the gallery Desert, area index 25, ID 166, created by Aloe_vera
{ {
@ -412,7 +412,7 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House5x5: // House5x5:
// The data has been exported from the gallery Desert, area index 26, ID 167, created by Aloe_vera // The data has been exported from the gallery Desert, area index 26, ID 167, created by Aloe_vera
{ {
@ -530,7 +530,7 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House7x5: // House7x5:
// The data has been exported from the gallery Desert, area index 27, ID 168, created by Aloe_vera // The data has been exported from the gallery Desert, area index 27, ID 168, created by Aloe_vera
{ {
@ -648,7 +648,7 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House8x5: // House8x5:
// The data has been exported from the gallery Desert, area index 28, ID 169, created by Aloe_vera // The data has been exported from the gallery Desert, area index 28, ID 169, created by Aloe_vera
{ {
@ -772,7 +772,7 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House8x7: // House8x7:
// The data has been exported from the gallery Desert, area index 29, ID 170, created by Aloe_vera // The data has been exported from the gallery Desert, area index 29, ID 170, created by Aloe_vera
{ {
@ -910,7 +910,7 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House9x7: // House9x7:
// The data has been exported from the gallery Desert, area index 30, ID 171, created by Aloe_vera // The data has been exported from the gallery Desert, area index 30, ID 171, created by Aloe_vera
{ {
@ -1049,7 +1049,7 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseL13x12: // HouseL13x12:
// The data has been exported from the gallery Desert, area index 53, ID 345, created by jakibaki // The data has been exported from the gallery Desert, area index 53, ID 345, created by jakibaki
{ {
@ -1220,7 +1220,7 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MarketStall: // MarketStall:
// The data has been exported from the gallery Desert, area index 34, ID 175, created by Aloe_vera // The data has been exported from the gallery Desert, area index 34, ID 175, created by Aloe_vera
{ {
@ -1330,7 +1330,7 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Marketplace: // Marketplace:
// The data has been exported from the gallery Desert, area index 38, ID 261, created by Aloe_vera // The data has been exported from the gallery Desert, area index 38, ID 261, created by Aloe_vera
{ {
@ -1472,7 +1472,7 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
const cPrefab::sDef g_SandFlatRoofVillageStartingPrefabs[] = const cPrefab::sDef g_SandFlatRoofVillageStartingPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Well: // Well:
// The data has been exported from the gallery Desert, area index 44, ID 275, created by Aloe_vera // The data has been exported from the gallery Desert, area index 44, ID 275, created by Aloe_vera
{ {

32
src/Generating/Prefabs/SandVillagePrefabs.cpp
View File

@ -15,7 +15,7 @@
const cPrefab::sDef g_SandVillagePrefabs[] = const cPrefab::sDef g_SandVillagePrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// DoubleField: // DoubleField:
// The data has been exported from the gallery Desert, area index 5, ID 75, created by tonibm1999 // The data has been exported from the gallery Desert, area index 5, ID 75, created by tonibm1999
{ {
@ -102,7 +102,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House11x7: // House11x7:
// The data has been exported from the gallery Desert, area index 6, ID 81, created by Aloe_vera // The data has been exported from the gallery Desert, area index 6, ID 81, created by Aloe_vera
{ {
@ -236,7 +236,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House11x9: // House11x9:
// The data has been exported from the gallery Desert, area index 11, ID 115, created by xoft // The data has been exported from the gallery Desert, area index 11, ID 115, created by xoft
{ {
@ -395,7 +395,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House13x7: // House13x7:
// The data has been exported from the gallery Desert, area index 15, ID 125, created by Aloe_vera // The data has been exported from the gallery Desert, area index 15, ID 125, created by Aloe_vera
{ {
@ -527,7 +527,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House13x9: // House13x9:
// The data has been exported from the gallery Desert, area index 12, ID 116, created by xoft // The data has been exported from the gallery Desert, area index 12, ID 116, created by xoft
{ {
@ -686,7 +686,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House15x9: // House15x9:
// The data has been exported from the gallery Desert, area index 13, ID 118, created by xoft // The data has been exported from the gallery Desert, area index 13, ID 118, created by xoft
{ {
@ -845,7 +845,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House16x9: // House16x9:
// The data has been exported from the gallery Desert, area index 16, ID 126, created by Aloe_vera // The data has been exported from the gallery Desert, area index 16, ID 126, created by Aloe_vera
{ {
@ -1004,7 +1004,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House7x7: // House7x7:
// The data has been exported from the gallery Desert, area index 8, ID 112, created by Aloe_vera // The data has been exported from the gallery Desert, area index 8, ID 112, created by Aloe_vera
{ {
@ -1128,7 +1128,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House9x7: // House9x7:
// The data has been exported from the gallery Desert, area index 9, ID 113, created by xoft // The data has been exported from the gallery Desert, area index 9, ID 113, created by xoft
{ {
@ -1253,7 +1253,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// House9x9: // House9x9:
// The data has been exported from the gallery Desert, area index 10, ID 114, created by xoft // The data has been exported from the gallery Desert, area index 10, ID 114, created by xoft
{ {
@ -1404,7 +1404,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseL14x12: // HouseL14x12:
// The data has been exported from the gallery Desert, area index 14, ID 124, created by Aloe_vera // The data has been exported from the gallery Desert, area index 14, ID 124, created by Aloe_vera
{ {
@ -1592,7 +1592,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// HouseL14x12: // HouseL14x12:
// The data has been exported from the gallery Desert, area index 7, ID 82, created by Aloe_vera // The data has been exported from the gallery Desert, area index 7, ID 82, created by Aloe_vera
{ {
@ -1763,7 +1763,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// SingleField: // SingleField:
// The data has been exported from the gallery Desert, area index 17, ID 127, created by Aloe_vera // The data has been exported from the gallery Desert, area index 17, ID 127, created by Aloe_vera
{ {
@ -1844,7 +1844,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// SmallHut: // SmallHut:
// The data has been exported from the gallery Desert, area index 4, ID 68, created by tonibm1999 // The data has been exported from the gallery Desert, area index 4, ID 68, created by tonibm1999
{ {
@ -1955,7 +1955,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
const cPrefab::sDef g_SandVillageStartingPrefabs[] = const cPrefab::sDef g_SandVillageStartingPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// RoofedWell: // RoofedWell:
// The data has been exported from the gallery Desert, area index 43, ID 274, created by Aloe_vera // The data has been exported from the gallery Desert, area index 43, ID 274, created by Aloe_vera
{ {
@ -2155,7 +2155,7 @@ const cPrefab::sDef g_SandVillageStartingPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Well: // Well:
// The data has been exported from the gallery Desert, area index 0, ID 1, created by Aloe_vera // The data has been exported from the gallery Desert, area index 0, ID 1, created by Aloe_vera
{ {

10
src/Generating/Prefabs/TestRailsPrefabs.cpp
View File

@ -15,7 +15,7 @@
const cPrefab::sDef g_TestRailsPrefabs[] = const cPrefab::sDef g_TestRailsPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// ActivatorRail: // ActivatorRail:
// The data has been exported from the gallery Plains, area index 251, ID 746, created by Aloe_vera // The data has been exported from the gallery Plains, area index 251, ID 746, created by Aloe_vera
{ {
@ -104,7 +104,7 @@ const cPrefab::sDef g_TestRailsPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// DetectorRail: // DetectorRail:
// The data has been exported from the gallery Plains, area index 250, ID 745, created by Aloe_vera // The data has been exported from the gallery Plains, area index 250, ID 745, created by Aloe_vera
{ {
@ -193,7 +193,7 @@ const cPrefab::sDef g_TestRailsPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// PowerRail: // PowerRail:
// The data has been exported from the gallery Plains, area index 248, ID 743, created by Aloe_vera // The data has been exported from the gallery Plains, area index 248, ID 743, created by Aloe_vera
{ {
@ -284,7 +284,7 @@ const cPrefab::sDef g_TestRailsPrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// RegularRail: // RegularRail:
// The data has been exported from the gallery Plains, area index 247, ID 742, created by Aloe_vera // The data has been exported from the gallery Plains, area index 247, ID 742, created by Aloe_vera
{ {
@ -383,7 +383,7 @@ const cPrefab::sDef g_TestRailsPrefabs[] =
const cPrefab::sDef g_TestRailsStartingPrefabs[] = const cPrefab::sDef g_TestRailsStartingPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CentralPiece: // CentralPiece:
// The data has been exported from the gallery Plains, area index 249, ID 744, created by Aloe_vera // The data has been exported from the gallery Plains, area index 249, ID 744, created by Aloe_vera
{ {

28
src/Generating/Prefabs/UnderwaterBasePrefabs.cpp
View File

@ -15,7 +15,7 @@
const cPrefab::sDef g_UnderwaterBasePrefabs[] = const cPrefab::sDef g_UnderwaterBasePrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// BrokenRoom: // BrokenRoom:
// The data has been exported from the gallery Water, area index 49, ID 680, created by STR_Warrior // The data has been exported from the gallery Water, area index 49, ID 680, created by STR_Warrior
{ {
@ -178,7 +178,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Corridor16: // Corridor16:
// The data has been exported from the gallery Water, area index 25, ID 566, created by xoft // The data has been exported from the gallery Water, area index 25, ID 566, created by xoft
{ {
@ -265,7 +265,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CorridorCorner: // CorridorCorner:
// The data has been exported from the gallery Water, area index 26, ID 569, created by xoft // The data has been exported from the gallery Water, area index 26, ID 569, created by xoft
{ {
@ -380,7 +380,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CorridorCrossing: // CorridorCrossing:
// The data has been exported from the gallery Water, area index 31, ID 581, created by LO1ZB // The data has been exported from the gallery Water, area index 31, ID 581, created by LO1ZB
{ {
@ -526,7 +526,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CorridorStairs: // CorridorStairs:
// The data has been exported from the gallery Water, area index 32, ID 582, created by LO1ZB // The data has been exported from the gallery Water, area index 32, ID 582, created by LO1ZB
{ {
@ -656,7 +656,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CorridorTee: // CorridorTee:
// The data has been exported from the gallery Water, area index 29, ID 576, created by LO1ZB // The data has been exported from the gallery Water, area index 29, ID 576, created by LO1ZB
{ {
@ -775,7 +775,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// ViewingCorner: // ViewingCorner:
// The data has been exported from the gallery Water, area index 40, ID 613, created by LO1ZB // The data has been exported from the gallery Water, area index 40, ID 613, created by LO1ZB
{ {
@ -958,7 +958,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// ViewingCorridor: // ViewingCorridor:
// The data has been exported from the gallery Water, area index 27, ID 571, created by LO1ZB // The data has been exported from the gallery Water, area index 27, ID 571, created by LO1ZB
{ {
@ -1065,7 +1065,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// ViewingCorridorBulge: // ViewingCorridorBulge:
// The data has been exported from the gallery Water, area index 42, ID 615, created by LO1ZB // The data has been exported from the gallery Water, area index 42, ID 615, created by LO1ZB
{ {
@ -1280,7 +1280,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// ViewingCrossing: // ViewingCrossing:
// The data has been exported from the gallery Water, area index 38, ID 611, created by LO1ZB // The data has been exported from the gallery Water, area index 38, ID 611, created by LO1ZB
{ {
@ -1483,7 +1483,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// ViewingEnd: // ViewingEnd:
// The data has been exported from the gallery Water, area index 41, ID 614, created by LO1ZB // The data has been exported from the gallery Water, area index 41, ID 614, created by LO1ZB
{ {
@ -1648,7 +1648,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// ViewingTee: // ViewingTee:
// The data has been exported from the gallery Water, area index 39, ID 612, created by LO1ZB // The data has been exported from the gallery Water, area index 39, ID 612, created by LO1ZB
{ {
@ -1850,7 +1850,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// WaterfallRoom: // WaterfallRoom:
// The data has been exported from the gallery Water, area index 50, ID 681, created by Aloe_vera // The data has been exported from the gallery Water, area index 50, ID 681, created by Aloe_vera
{ {
@ -2059,7 +2059,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
const cPrefab::sDef g_UnderwaterBaseStartingPrefabs[] = const cPrefab::sDef g_UnderwaterBaseStartingPrefabs[] =
{ {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CentralRoom: // CentralRoom:
// The data has been exported from the gallery Water, area index 24, ID 564, created by xoft // The data has been exported from the gallery Water, area index 24, ID 564, created by xoft
{ {

4
src/Generating/RainbowRoadsGen.cpp
View File

@ -18,7 +18,7 @@ static cPrefabPiecePool g_RainbowRoads(g_RainbowRoadPrefabs, g_RainbowRoadPrefab
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cRainbowRoadsGen::cRainbowRoads: // cRainbowRoadsGen::cRainbowRoads:
class cRainbowRoadsGen::cRainbowRoads : class cRainbowRoadsGen::cRainbowRoads :
@ -86,7 +86,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cRainbowRoadsGen: // cRainbowRoadsGen:

4
src/Generating/Ravines.cpp
View File

@ -77,7 +77,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenRavines: // cStructGenRavines:
cStructGenRavines::cStructGenRavines(int a_Seed, int a_Size) : cStructGenRavines::cStructGenRavines(int a_Seed, int a_Size) :
@ -101,7 +101,7 @@ cGridStructGen::cStructurePtr cStructGenRavines::CreateStructure(int a_GridX, in
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenRavines::cRavine // cStructGenRavines::cRavine
cStructGenRavines::cRavine::cRavine(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_Size, cNoise & a_Noise) : cStructGenRavines::cRavine::cRavine(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_Size, cNoise & a_Noise) :

12
src/Generating/StructGen.cpp
View File

@ -12,7 +12,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenOreNests configuration: // cStructGenOreNests configuration:
const int MAX_HEIGHT_COAL = 127; const int MAX_HEIGHT_COAL = 127;
@ -51,7 +51,7 @@ const int NEST_SIZE_GRAVEL = 32;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenTrees: // cStructGenTrees:
void cStructGenTrees::GenFinish(cChunkDesc & a_ChunkDesc) void cStructGenTrees::GenFinish(cChunkDesc & a_ChunkDesc)
@ -303,7 +303,7 @@ int cStructGenTrees::GetNumTrees(
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenOreNests: // cStructGenOreNests:
void cStructGenOreNests::GenFinish(cChunkDesc & a_ChunkDesc) void cStructGenOreNests::GenFinish(cChunkDesc & a_ChunkDesc)
@ -410,7 +410,7 @@ void cStructGenOreNests::GenerateOre(int a_ChunkX, int a_ChunkZ, BLOCKTYPE a_Ore
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenLakes: // cStructGenLakes:
void cStructGenLakes::GenFinish(cChunkDesc & a_ChunkDesc) void cStructGenLakes::GenFinish(cChunkDesc & a_ChunkDesc)
@ -532,7 +532,7 @@ void cStructGenLakes::CreateLakeImage(int a_ChunkX, int a_ChunkZ, cBlockArea & a
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenDirectOverhangs: // cStructGenDirectOverhangs:
cStructGenDirectOverhangs::cStructGenDirectOverhangs(int a_Seed) : cStructGenDirectOverhangs::cStructGenDirectOverhangs(int a_Seed) :
@ -648,7 +648,7 @@ bool cStructGenDirectOverhangs::HasWantedBiome(cChunkDesc & a_ChunkDesc) const
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cStructGenDistortedMembraneOverhangs: // cStructGenDistortedMembraneOverhangs:
cStructGenDistortedMembraneOverhangs::cStructGenDistortedMembraneOverhangs(int a_Seed) : cStructGenDistortedMembraneOverhangs::cStructGenDistortedMembraneOverhangs(int a_Seed) :

4
src/Generating/TestRailsGen.cpp
View File

@ -18,7 +18,7 @@ static cPrefabPiecePool g_TestRails(g_TestRailsPrefabs, g_TestRailsPrefabsCount,
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cTestRailsGen::cTestRails: // cTestRailsGen::cTestRails:
class cTestRailsGen::cTestRails : class cTestRailsGen::cTestRails :
@ -86,7 +86,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cTestRailsGen: // cTestRailsGen:

4
src/Generating/UnderwaterBaseGen.cpp
View File

@ -18,7 +18,7 @@ static cPrefabPiecePool g_UnderwaterBase(g_UnderwaterBasePrefabs, g_UnderwaterBa
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cUnderwaterBaseGen::cUnderwaterBase: // cUnderwaterBaseGen::cUnderwaterBase:
class cUnderwaterBaseGen::cUnderwaterBase : class cUnderwaterBaseGen::cUnderwaterBase :
@ -86,7 +86,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cUnderwaterBaseGen: // cUnderwaterBaseGen:

2
src/Generating/VillageGen.cpp
View File

@ -333,7 +333,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cVillageGen: // cVillageGen:
static cVillagePiecePool g_SandVillage(g_SandVillagePrefabs, g_SandVillagePrefabsCount, g_SandVillageStartingPrefabs, g_SandVillageStartingPrefabsCount); static cVillagePiecePool g_SandVillage(g_SandVillagePrefabs, g_SandVillagePrefabsCount, g_SandVillageStartingPrefabs, g_SandVillageStartingPrefabsCount);

6
src/HTTPServer/HTTPMessage.cpp
View File

@ -20,7 +20,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cHTTPMessage: // cHTTPMessage:
cHTTPMessage::cHTTPMessage(eKind a_Kind) : cHTTPMessage::cHTTPMessage(eKind a_Kind) :
@ -64,7 +64,7 @@ void cHTTPMessage::AddHeader(const AString & a_Key, const AString & a_Value)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cHTTPRequest: // cHTTPRequest:
cHTTPRequest::cHTTPRequest(void) : cHTTPRequest::cHTTPRequest(void) :
@ -248,7 +248,7 @@ void cHTTPRequest::OnHeaderLine(const AString & a_Key, const AString & a_Value)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cHTTPResponse: // cHTTPResponse:
cHTTPResponse::cHTTPResponse(void) : cHTTPResponse::cHTTPResponse(void) :

2
src/HTTPServer/HTTPServer.cpp
View File

@ -118,7 +118,7 @@ class cDebugCallbacks :
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cHTTPServer: // cHTTPServer:
cHTTPServer::cHTTPServer(void) : cHTTPServer::cHTTPServer(void) :

4
src/HTTPServer/MultipartParser.cpp
View File

@ -21,7 +21,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// self-test: // self-test:
#if 0 #if 0
@ -87,7 +87,7 @@ ThisIsIgnoredEpilogue";
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cMultipartParser: // cMultipartParser:

2
src/HTTPServer/NameValueParser.cpp
View File

@ -69,7 +69,7 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cNameValueParser: // cNameValueParser:
cNameValueParser::cNameValueParser(bool a_AllowsKeyOnly) : cNameValueParser::cNameValueParser(bool a_AllowsKeyOnly) :

2
src/Item.cpp
View File

@ -375,7 +375,7 @@ bool cItem::EnchantByXPLevels(int a_NumXPLevels)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cItems: // cItems:
cItem * cItems::Get(int a_Idx) cItem * cItems::Get(int a_Idx)

19
src/Items/ItemFishingRod.h
View File

@ -17,7 +17,9 @@
/////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
// cFloaterCallback // cFloaterCallback
class cFloaterCallback : class cFloaterCallback :
public cEntityCallback public cEntityCallback
@ -49,8 +51,13 @@ protected:
Vector3d m_Pos; Vector3d m_Pos;
} ; } ;
////////////////////////////////////////////////////////////////////////////
// cSweepEntityCallback
////////////////////////////////////////////////////////////////////////////////
// cSweepEntityCallback:
class cSweepEntityCallback : class cSweepEntityCallback :
public cEntityCallback public cEntityCallback
{ {
@ -73,6 +80,8 @@ protected:
class cItemFishingRodHandler : class cItemFishingRodHandler :
public cItemHandler public cItemHandler
{ {
@ -237,3 +246,7 @@ public:
return true; return true;
} }
} ; } ;

2
src/Items/ItemHandler.cpp
View File

@ -362,7 +362,7 @@ char cItemHandler::GetMaxStackSize(void)
return 64; return 64;
} }
switch (m_ItemType) //sorted by id switch (m_ItemType)
{ {
case E_ITEM_ARROW: return 64; case E_ITEM_ARROW: return 64;
case E_ITEM_BAKED_POTATO: return 64; case E_ITEM_BAKED_POTATO: return 64;

6
src/Items/ItemHandler.h
View File

@ -112,11 +112,11 @@ public:
protected: protected:
int m_ItemType; int m_ItemType;
static cItemHandler *CreateItemHandler(int m_ItemType); static cItemHandler * CreateItemHandler(int m_ItemType);
static cItemHandler * m_ItemHandler[E_ITEM_LAST + 1]; static cItemHandler * m_ItemHandler[E_ITEM_LAST + 1];
static bool m_HandlerInitialized; //used to detect if the itemhandlers are initialized static bool m_HandlerInitialized; // used to detect if the itemhandlers are initialized
}; };
//Short function // Short function
inline cItemHandler *ItemHandler(int a_ItemType) { return cItemHandler::GetItemHandler(a_ItemType); } inline cItemHandler *ItemHandler(int a_ItemType) { return cItemHandler::GetItemHandler(a_ItemType); }

2
src/Items/ItemLeaves.h
View File

@ -31,7 +31,7 @@ public:
a_CursorX, a_CursorY, a_CursorZ, a_CursorX, a_CursorY, a_CursorZ,
a_BlockType, a_BlockMeta a_BlockType, a_BlockMeta
); );
a_BlockMeta = a_BlockMeta | 0x4; //0x4 bit set means this is a player-placed leaves block, not to be decayed a_BlockMeta = a_BlockMeta | 0x4; // 0x4 bit set means this is a player-placed leaves block, not to be decayed
return res; return res;
} }
} ; } ;

4
src/LightingThread.cpp
View File

@ -84,7 +84,7 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cLightingThread: // cLightingThread:
cLightingThread::cLightingThread(void) : cLightingThread::cLightingThread(void) :
@ -582,7 +582,7 @@ void cLightingThread::QueueChunkStay(cLightingChunkStay & a_ChunkStay)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cLightingThread::cLightingChunkStay: // cLightingThread::cLightingChunkStay:
cLightingThread::cLightingChunkStay::cLightingChunkStay(cLightingThread & a_LightingThread, int a_ChunkX, int a_ChunkZ, cChunkCoordCallback * a_CallbackAfter) : cLightingThread::cLightingChunkStay::cLightingChunkStay(cLightingThread & a_LightingThread, int a_ChunkX, int a_ChunkZ, cChunkCoordCallback * a_CallbackAfter) :

2
src/MCLogger.cpp
View File

@ -227,7 +227,7 @@ void cMCLogger::ResetColor(void)
////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Global functions // Global functions
void LOG(const char* a_Format, ...) void LOG(const char* a_Format, ...)

8
src/Mobs/Monster.cpp
View File

@ -62,7 +62,7 @@ static const struct
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cMonster: // cMonster:
cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height) cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height)
@ -325,7 +325,7 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
AddSpeedZ(Distance.z); AddSpeedZ(Distance.z);
if (m_EMState == ESCAPING) if (m_EMState == ESCAPING)
{ //Runs Faster when escaping :D otherwise they just walk away { // Runs Faster when escaping :D otherwise they just walk away
SetSpeedX (GetSpeedX() * 2.f); SetSpeedX (GetSpeedX() * 2.f);
SetSpeedZ (GetSpeedZ() * 2.f); SetSpeedZ (GetSpeedZ() * 2.f);
} }
@ -570,8 +570,8 @@ void cMonster::KilledBy(TakeDamageInfo & a_TDI)
//Checks to see if EventSeePlayer should be fired // Checks to see if EventSeePlayer should be fired
//monster sez: Do I see the player // monster sez: Do I see the player
void cMonster::CheckEventSeePlayer(void) void cMonster::CheckEventSeePlayer(void)
{ {
// TODO: Rewrite this to use cWorld's DoWithPlayers() // TODO: Rewrite this to use cWorld's DoWithPlayers()

3
src/Mobs/Villager.h
View File

@ -37,9 +37,8 @@ public:
/** return true if the given blocktype are: crops, potatoes or carrots.*/ /** return true if the given blocktype are: crops, potatoes or carrots.*/
bool IsBlockFarmable(BLOCKTYPE a_BlockType); bool IsBlockFarmable(BLOCKTYPE a_BlockType);
//////////////////////////////////////////////////////////////////
// Farmer functions // Farmer functions
/** It searches in a 11x7x11 area for crops. If it found some it will navigate to them.*/ /** Searches in a 11x7x11 area for crops. If it found some it will navigate to them.*/
void HandleFarmerPrepareFarmCrops(); void HandleFarmerPrepareFarmCrops();
/** Looks if the farmer has reached it's destination, and if it's still crops and the destination is closer then 2 blocks it will harvest them.*/ /** Looks if the farmer has reached it's destination, and if it's still crops and the destination is closer then 2 blocks it will harvest them.*/

14
src/Noise.cpp
View File

@ -9,7 +9,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Globals: // Globals:
void Debug3DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, int a_SizeZ, const AString & a_FileNameBase) void Debug3DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, int a_SizeZ, const AString & a_FileNameBase)
@ -90,7 +90,7 @@ void Debug2DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, cons
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCubicCell2D: // cCubicCell2D:
class cCubicCell2D class cCubicCell2D
@ -239,7 +239,7 @@ void cCubicCell2D::Move(int a_NewFloorX, int a_NewFloorY)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCubicCell3D: // cCubicCell3D:
class cCubicCell3D class cCubicCell3D
@ -422,7 +422,7 @@ void cCubicCell3D::Move(int a_NewFloorX, int a_NewFloorY, int a_NewFloorZ)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cNoise: // cNoise:
cNoise::cNoise(int a_Seed) : cNoise::cNoise(int a_Seed) :
@ -582,7 +582,7 @@ NOISE_DATATYPE cNoise::CubicNoise3D(NOISE_DATATYPE a_X, NOISE_DATATYPE a_Y, NOIS
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCubicNoise: // cCubicNoise:
#ifdef _DEBUG #ifdef _DEBUG
@ -782,7 +782,7 @@ void cCubicNoise::CalcFloorFrac(
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cPerlinNoise: // cPerlinNoise:
cPerlinNoise::cPerlinNoise(void) : cPerlinNoise::cPerlinNoise(void) :
@ -952,7 +952,7 @@ void cPerlinNoise::Generate3D(
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cRidgedMultiNoise: // cRidgedMultiNoise:
cRidgedMultiNoise::cRidgedMultiNoise(void) : cRidgedMultiNoise::cRidgedMultiNoise(void) :

4
src/Noise.h
View File

@ -256,7 +256,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Inline function definitions: // Inline function definitions:
// These need to be in the header, otherwise linker error occur in MSVC // These need to be in the header, otherwise linker error occur in MSVC
@ -361,7 +361,7 @@ NOISE_DATATYPE cNoise::LinearInterpolate(NOISE_DATATYPE a_A, NOISE_DATATYPE a_B,
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Global functions: // Global functions:
extern void Debug2DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, const AString & a_FileNameBase); extern void Debug2DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, const AString & a_FileNameBase);

6
src/OSSupport/CriticalSection.cpp
View File

@ -6,7 +6,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCriticalSection: // cCriticalSection:
cCriticalSection::cCriticalSection() cCriticalSection::cCriticalSection()
@ -105,7 +105,7 @@ bool cCriticalSection::IsLockedByCurrentThread(void)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCSLock // cCSLock
cCSLock::cCSLock(cCriticalSection * a_CS) cCSLock::cCSLock(cCriticalSection * a_CS)
@ -165,7 +165,7 @@ void cCSLock::Unlock(void)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCSUnlock: // cCSUnlock:
cCSUnlock::cCSUnlock(cCSLock & a_Lock) : cCSUnlock::cCSUnlock(cCSLock & a_Lock) :

2
src/OSSupport/SocketThreads.cpp
View File

@ -13,7 +13,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSocketThreads: // cSocketThreads:
cSocketThreads::cSocketThreads(void) cSocketThreads::cSocketThreads(void)

2
src/PolarSSL++/Sha1Checksum.cpp
View File

@ -50,7 +50,7 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSha1Checksum: // cSha1Checksum:
cSha1Checksum::cSha1Checksum(void) : cSha1Checksum::cSha1Checksum(void) :

2
src/Protocol/Protocol.h
View File

@ -132,7 +132,7 @@ public:
protected: protected:
cClientHandle * m_Client; cClientHandle * m_Client;
cCriticalSection m_CSPacket; //< Each SendXYZ() function must acquire this CS in order to send the whole packet at once cCriticalSection m_CSPacket; // Each SendXYZ() function must acquire this CS in order to send the whole packet at once
/// A generic data-sending routine, all outgoing packet data needs to be routed through this so that descendants may override it /// A generic data-sending routine, all outgoing packet data needs to be routed through this so that descendants may override it
virtual void SendData(const char * a_Data, size_t a_Size) = 0; virtual void SendData(const char * a_Data, size_t a_Size) = 0;

6
src/Protocol/Protocol125.cpp
View File

@ -473,7 +473,7 @@ void cProtocol125::SendEntityVelocity(const cEntity & a_Entity)
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte(PACKET_ENTITY_VELOCITY); WriteByte(PACKET_ENTITY_VELOCITY);
WriteInt (a_Entity.GetUniqueID()); WriteInt (a_Entity.GetUniqueID());
WriteShort((short) (a_Entity.GetSpeedX() * 400)); //400 = 8000 / 20 WriteShort((short) (a_Entity.GetSpeedX() * 400)); // 400 = 8000 / 20
WriteShort((short) (a_Entity.GetSpeedY() * 400)); WriteShort((short) (a_Entity.GetSpeedY() * 400));
WriteShort((short) (a_Entity.GetSpeedZ() * 400)); WriteShort((short) (a_Entity.GetSpeedZ() * 400));
Flush(); Flush();
@ -1972,7 +1972,7 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
case cMonster::mtZombie: case cMonster::mtZombie:
{ {
WriteByte(0xC); WriteByte(0xC);
WriteByte(((const cZombie &)a_Mob).IsBaby() ? 1 : 0); // Babby zombie? WriteByte(((const cZombie &)a_Mob).IsBaby() ? 1 : 0); // Baby zombie?
WriteByte(0xD); WriteByte(0xD);
WriteByte(((const cZombie &)a_Mob).IsVillagerZombie() ? 1 : 0); // Converted zombie? WriteByte(((const cZombie &)a_Mob).IsVillagerZombie() ? 1 : 0); // Converted zombie?
WriteByte(0xE); WriteByte(0xE);
@ -1982,7 +1982,7 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
case cMonster::mtGhast: case cMonster::mtGhast:
{ {
WriteByte(0x10); WriteByte(0x10);
WriteByte(((const cGhast &)a_Mob).IsCharging()); // About to eject un flamé-bol? :P WriteByte(((const cGhast &)a_Mob).IsCharging()); // About to spit a flameball?
break; break;
} }
case cMonster::mtWolf: case cMonster::mtWolf:

2
src/Protocol/Protocol132.cpp
View File

@ -71,7 +71,7 @@ enum
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProtocol132: // cProtocol132:
cProtocol132::cProtocol132(cClientHandle * a_Client) : cProtocol132::cProtocol132(cClientHandle * a_Client) :

4
src/Protocol/Protocol14x.cpp
View File

@ -66,7 +66,7 @@ enum
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProtocol142: // cProtocol142:
cProtocol142::cProtocol142(cClientHandle * a_Client) : cProtocol142::cProtocol142(cClientHandle * a_Client) :
@ -144,7 +144,7 @@ void cProtocol142::SendTimeUpdate(Int64 a_WorldAge, Int64 a_TimeOfDay)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProtocol146: // cProtocol146:
cProtocol146::cProtocol146(cClientHandle * a_Client) : cProtocol146::cProtocol146(cClientHandle * a_Client) :

2
src/Protocol/Protocol15x.cpp
View File

@ -47,7 +47,7 @@ enum
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProtocol150: // cProtocol150:
cProtocol150::cProtocol150(cClientHandle * a_Client) : cProtocol150::cProtocol150(cClientHandle * a_Client) :

4
src/Protocol/Protocol16x.cpp
View File

@ -55,7 +55,7 @@ enum
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProtocol161: // cProtocol161:
cProtocol161::cProtocol161(cClientHandle * a_Client) : cProtocol161::cProtocol161(cClientHandle * a_Client) :
@ -282,7 +282,7 @@ int cProtocol161::ParsePacket(unsigned char a_PacketType)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProtocol162: // cProtocol162:
cProtocol162::cProtocol162(cClientHandle * a_Client) : cProtocol162::cProtocol162(cClientHandle * a_Client) :

8
src/Protocol/Protocol17x.cpp
View File

@ -81,7 +81,7 @@ extern bool g_ShouldLogCommIn, g_ShouldLogCommOut;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProtocol172: // cProtocol172:
cProtocol172::cProtocol172(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State) : cProtocol172::cProtocol172(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State) :
@ -2463,7 +2463,7 @@ void cProtocol172::AddChatPartStyle(Json::Value & a_Value, const AString & a_Par
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProtocol172::cPacketizer: // cProtocol172::cPacketizer:
cProtocol172::cPacketizer::~cPacketizer() cProtocol172::cPacketizer::~cPacketizer()
@ -2985,7 +2985,7 @@ void cProtocol172::cPacketizer::WriteEntityProperties(const cEntity & a_Entity)
return; return;
} }
//const cMonster & Mob = (const cMonster &)a_Entity; // const cMonster & Mob = (const cMonster &)a_Entity;
// TODO: Send properties and modifiers based on the mob type // TODO: Send properties and modifiers based on the mob type
@ -2996,7 +2996,7 @@ void cProtocol172::cPacketizer::WriteEntityProperties(const cEntity & a_Entity)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cProtocol176: // cProtocol176:
cProtocol176::cProtocol176(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State) : cProtocol176::cProtocol176(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State) :

4
src/Protocol/ProtocolRecognizer.h
View File

@ -139,8 +139,8 @@ public:
virtual void SendData(const char * a_Data, size_t a_Size) override; virtual void SendData(const char * a_Data, size_t a_Size) override;
protected: protected:
cProtocol * m_Protocol; //< The recognized protocol cProtocol * m_Protocol; ///< The recognized protocol
cByteBuffer m_Buffer; //< Buffer for the incoming data until we recognize the protocol cByteBuffer m_Buffer; ///< Buffer for the incoming data until we recognize the protocol
/// Tries to recognize protocol based on m_Buffer contents; returns true if recognized /// Tries to recognize protocol based on m_Buffer contents; returns true if recognized
bool TryRecognizeProtocol(void); bool TryRecognizeProtocol(void);

6
src/RCONServer.cpp
View File

@ -38,7 +38,7 @@ enum
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cRCONCommandOutput: // cRCONCommandOutput:
class cRCONCommandOutput : class cRCONCommandOutput :
@ -73,7 +73,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cRCONServer: // cRCONServer:
cRCONServer::cRCONServer(cServer & a_Server) : cRCONServer::cRCONServer(cServer & a_Server) :
@ -154,7 +154,7 @@ void cRCONServer::OnConnectionAccepted(cSocket & a_Socket)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cRCONServer::cConnection: // cRCONServer::cConnection:
cRCONServer::cConnection::cConnection(cRCONServer & a_RCONServer, cSocket & a_Socket) : cRCONServer::cConnection::cConnection(cRCONServer & a_RCONServer, cSocket & a_Socket) :

6
src/Server.cpp
View File

@ -60,7 +60,7 @@ typedef std::list< cClientHandle* > ClientList;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cServer::cTickThread: // cServer::cTickThread:
cServer::cTickThread::cTickThread(cServer & a_Server) : cServer::cTickThread::cTickThread(cServer & a_Server) :
@ -101,7 +101,7 @@ void cServer::cTickThread::Execute(void)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cServer: // cServer:
cServer::cServer(void) : cServer::cServer(void) :
@ -673,7 +673,7 @@ void cServer::AuthenticateUser(int a_ClientID, const AString & a_Name, const ASt
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cServer::cNotifyWriteThread: // cServer::cNotifyWriteThread:
cServer::cNotifyWriteThread::cNotifyWriteThread(void) : cServer::cNotifyWriteThread::cNotifyWriteThread(void) :

6
src/Simulator/DelayedFluidSimulator.cpp
View File

@ -14,7 +14,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cDelayedFluidSimulatorChunkData::cSlot // cDelayedFluidSimulatorChunkData::cSlot
bool cDelayedFluidSimulatorChunkData::cSlot::Add(int a_RelX, int a_RelY, int a_RelZ) bool cDelayedFluidSimulatorChunkData::cSlot::Add(int a_RelX, int a_RelY, int a_RelZ)
@ -40,7 +40,7 @@ bool cDelayedFluidSimulatorChunkData::cSlot::Add(int a_RelX, int a_RelY, int a_R
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cDelayedFluidSimulatorChunkData: // cDelayedFluidSimulatorChunkData:
cDelayedFluidSimulatorChunkData::cDelayedFluidSimulatorChunkData(int a_TickDelay) : cDelayedFluidSimulatorChunkData::cDelayedFluidSimulatorChunkData(int a_TickDelay) :
@ -62,7 +62,7 @@ cDelayedFluidSimulatorChunkData::~cDelayedFluidSimulatorChunkData()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cDelayedFluidSimulator: // cDelayedFluidSimulator:
cDelayedFluidSimulator::cDelayedFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid, int a_TickDelay) : cDelayedFluidSimulator::cDelayedFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid, int a_TickDelay) :

2
src/Simulator/FireSimulator.cpp
View File

@ -63,7 +63,7 @@ static const struct
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFireSimulator: // cFireSimulator:
cFireSimulator::cFireSimulator(cWorld & a_World, cIniFile & a_IniFile) : cFireSimulator::cFireSimulator(cWorld & a_World, cIniFile & a_IniFile) :

14
src/Simulator/FluidSimulator.cpp
View File

@ -132,24 +132,24 @@ Direction cFluidSimulator::GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a
/* /*
Disabled because of causing problems and being useless atm Disabled because of causing problems and being useless atm
char BlockBelow = m_World.GetBlock(a_X, a_Y - 1, a_Z); //If there is nothing or fluid below it -> dominating flow is down :D char BlockBelow = m_World.GetBlock(a_X, a_Y - 1, a_Z); // If there is nothing or fluid below it -> dominating flow is down :D
if (BlockBelow == E_BLOCK_AIR || IsAllowedBlock(BlockBelow)) if (BlockBelow == E_BLOCK_AIR || IsAllowedBlock(BlockBelow))
return Y_MINUS; return Y_MINUS;
*/ */
NIBBLETYPE LowestPoint = m_World.GetBlockMeta(a_X, a_Y, a_Z); //Current Block Meta so only lower points will be counted NIBBLETYPE LowestPoint = m_World.GetBlockMeta(a_X, a_Y, a_Z); // Current Block Meta so only lower points will be counted
int X = 0, Z = 0; //Lowest Pos will be stored here int X = 0, Z = 0; // Lowest Pos will be stored here
if (IsAllowedBlock(m_World.GetBlock(a_X, a_Y + 1, a_Z)) && a_Over) //check for upper block to flow because this also affects the flowing direction if (IsAllowedBlock(m_World.GetBlock(a_X, a_Y + 1, a_Z)) && a_Over) // check for upper block to flow because this also affects the flowing direction
{ {
return GetFlowingDirection(a_X, a_Y + 1, a_Z, false); return GetFlowingDirection(a_X, a_Y + 1, a_Z, false);
} }
std::vector< Vector3i * > Points; std::vector< Vector3i * > Points;
Points.reserve(4); //Already allocate 4 places :D Points.reserve(4); // Already allocate 4 places :D
//add blocks around the checking pos // add blocks around the checking pos
Points.push_back(new Vector3i(a_X - 1, a_Y, a_Z)); Points.push_back(new Vector3i(a_X - 1, a_Y, a_Z));
Points.push_back(new Vector3i(a_X + 1, a_Y, a_Z)); Points.push_back(new Vector3i(a_X + 1, a_Y, a_Z));
Points.push_back(new Vector3i(a_X, a_Y, a_Z + 1)); Points.push_back(new Vector3i(a_X, a_Y, a_Z + 1));
@ -172,7 +172,7 @@ Direction cFluidSimulator::GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a
} }
else if(BlockID == E_BLOCK_AIR) else if(BlockID == E_BLOCK_AIR)
{ {
LowestPoint = 9; //This always dominates LowestPoint = 9; // This always dominates
X = Pos->x; X = Pos->x;
Z = Pos->z; Z = Pos->z;

2
src/Simulator/IncrementalRedstoneSimulator.cpp
View File

@ -2086,7 +2086,7 @@ bool cIncrementalRedstoneSimulator::QueueRepeaterPowerChange(int a_RelBlockX, in
RC.a_RelBlockPos = Vector3i(a_RelBlockX, a_RelBlockY, a_RelBlockZ); RC.a_RelBlockPos = Vector3i(a_RelBlockX, a_RelBlockY, a_RelBlockZ);
// Gets the top two bits (delay time), shifts them into the lower two bits, and adds one (meta 0 = 1 tick; 1 = 2 etc.) // Gets the top two bits (delay time), shifts them into the lower two bits, and adds one (meta 0 = 1 tick; 1 = 2 etc.)
// * 2 because in MCS, 1 redstone tick = 1 world tick, but in Vanilla, 1 redstone tick = 2 world ticks, and we need to maintain compatibility // Multiply by 2 because in MCS, 1 redstone tick = 1 world tick, but in Vanilla, 1 redstone tick = 2 world ticks, and we need to maintain compatibility
RC.a_DelayTicks = (((a_Meta & 0xC) >> 0x2) + 1) * 2; RC.a_DelayTicks = (((a_Meta & 0xC) >> 0x2) + 1) * 2;
RC.a_ElapsedTicks = 0; RC.a_ElapsedTicks = 0;

2
src/Simulator/NoopRedstoneSimulator.h
View File

@ -18,7 +18,7 @@ public:
{ {
} }
//~cRedstoneNoopSimulator(); // ~cRedstoneNoopSimulator();
virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);} // not used virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);} // not used
virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override

8
src/StringUtils.cpp
View File

@ -339,9 +339,9 @@ AString & RawBEToUTF8(const char * a_RawData, size_t a_NumShorts, AString & a_UT
// UTF-8 conversion code adapted from: // UTF-8 conversion code adapted from:
// http://stackoverflow.com/questions/2867123/convert-utf-16-to-utf-8-under-windows-and-linux-in-c // http://stackoverflow.com/questions/2867123/convert-utf-16-to-utf-8-under-windows-and-linux-in-c
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Begin of Unicode, Inc.'s code / information // Begin of Unicode, Inc.'s code / information
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/* /*
Notice from the original file: Notice from the original file:
@ -519,9 +519,9 @@ are equivalent to the following loop:
--------------------------------------------------------------------- ---------------------------------------------------------------------
*/ */
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// End of Unicode, Inc.'s code / information // End of Unicode, Inc.'s code / information
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

28
src/Tracer.cpp
View File

@ -273,36 +273,50 @@ int LinesCross(float x0,float y0,float x1,float y1,float x2,float y2,float x3,fl
// 2 = the segment lies in the plane // 2 = the segment lies in the plane
int cTracer::intersect3D_SegmentPlane( const Vector3f & a_Origin, const Vector3f & a_End, const Vector3f & a_PlanePos, const Vector3f & a_PlaneNormal ) int cTracer::intersect3D_SegmentPlane( const Vector3f & a_Origin, const Vector3f & a_End, const Vector3f & a_PlanePos, const Vector3f & a_PlaneNormal )
{ {
Vector3f u = a_End - a_Origin;//a_Ray.P1 - S.P0; Vector3f u = a_End - a_Origin; // a_Ray.P1 - S.P0;
Vector3f w = a_Origin - a_PlanePos;//S.P0 - Pn.V0; Vector3f w = a_Origin - a_PlanePos; // S.P0 - Pn.V0;
float D = a_PlaneNormal.Dot( u );//dot(Pn.n, u); float D = a_PlaneNormal.Dot( u ); // dot(Pn.n, u);
float N = -(a_PlaneNormal.Dot( w ) );//-dot(a_Plane.n, w); float N = -(a_PlaneNormal.Dot( w ) ); // -dot(a_Plane.n, w);
const float EPSILON = 0.0001f; const float EPSILON = 0.0001f;
if (fabs(D) < EPSILON) { // segment is parallel to plane if (fabs(D) < EPSILON)
if (N == 0) // segment lies in plane {
// segment is parallel to plane
if (N == 0)
{
// segment lies in plane
return 2; return 2;
}
return 0; // no intersection return 0; // no intersection
} }
// they are not parallel // they are not parallel
// compute intersect param // compute intersect param
float sI = N / D; float sI = N / D;
if (sI < 0 || sI > 1) if (sI < 0 || sI > 1)
{
return 0; // no intersection return 0; // no intersection
}
// Vector3f I ( a_Ray->GetOrigin() + sI * u );//S.P0 + sI * u; // compute segment intersect point // Vector3f I ( a_Ray->GetOrigin() + sI * u );// S.P0 + sI * u; // compute segment intersect point
RealHit = a_Origin + u * sI; RealHit = a_Origin + u * sI;
return 1; return 1;
} }
int cTracer::GetHitNormal(const Vector3f & start, const Vector3f & end, const Vector3i & a_BlockPos) int cTracer::GetHitNormal(const Vector3f & start, const Vector3f & end, const Vector3i & a_BlockPos)
{ {
Vector3i SmallBlockPos = a_BlockPos; Vector3i SmallBlockPos = a_BlockPos;
char BlockID = m_World->GetBlock( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z ); char BlockID = m_World->GetBlock( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z );
if( BlockID == E_BLOCK_AIR || IsBlockWater(BlockID)) if( BlockID == E_BLOCK_AIR || IsBlockWater(BlockID))
{
return 0; return 0;
}
Vector3f BlockPos; Vector3f BlockPos;
BlockPos = Vector3f(SmallBlockPos); BlockPos = Vector3f(SmallBlockPos);

24
src/UI/SlotArea.cpp
View File

@ -20,7 +20,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotArea: // cSlotArea:
cSlotArea::cSlotArea(int a_NumSlots, cWindow & a_ParentWindow) : cSlotArea::cSlotArea(int a_NumSlots, cWindow & a_ParentWindow) :
@ -409,7 +409,7 @@ bool cSlotArea::CollectItemsToHand(cItem & a_Dragging, cPlayer & a_Player, bool
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotAreaChest: // cSlotAreaChest:
cSlotAreaChest::cSlotAreaChest(cChestEntity * a_Chest, cWindow & a_ParentWindow) : cSlotAreaChest::cSlotAreaChest(cChestEntity * a_Chest, cWindow & a_ParentWindow) :
@ -441,7 +441,7 @@ void cSlotAreaChest::SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotAreaDoubleChest: // cSlotAreaDoubleChest:
cSlotAreaDoubleChest::cSlotAreaDoubleChest(cChestEntity * a_TopChest, cChestEntity * a_BottomChest, cWindow & a_ParentWindow) : cSlotAreaDoubleChest::cSlotAreaDoubleChest(cChestEntity * a_TopChest, cChestEntity * a_BottomChest, cWindow & a_ParentWindow) :
@ -488,7 +488,7 @@ void cSlotAreaDoubleChest::SetSlot(int a_SlotNum, cPlayer & a_Player, const cIte
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotAreaCrafting: // cSlotAreaCrafting:
cSlotAreaCrafting::cSlotAreaCrafting(int a_GridSize, cWindow & a_ParentWindow) : cSlotAreaCrafting::cSlotAreaCrafting(int a_GridSize, cWindow & a_ParentWindow) :
@ -764,7 +764,7 @@ void cSlotAreaCrafting::HandleCraftItem(const cItem & a_Result, cPlayer & a_Play
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotAreaAnvil: // cSlotAreaAnvil:
cSlotAreaAnvil::cSlotAreaAnvil(cAnvilWindow & a_ParentWindow) : cSlotAreaAnvil::cSlotAreaAnvil(cAnvilWindow & a_ParentWindow) :
@ -1191,7 +1191,7 @@ void cSlotAreaAnvil::UpdateResult(cPlayer & a_Player)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotAreaEnchanting: // cSlotAreaEnchanting:
cSlotAreaEnchanting::cSlotAreaEnchanting(cEnchantingWindow & a_ParentWindow) : cSlotAreaEnchanting::cSlotAreaEnchanting(cEnchantingWindow & a_ParentWindow) :
@ -1496,7 +1496,7 @@ int cSlotAreaEnchanting::GetBookshelvesCount(cWorld * a_World)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotAreaEnderChest: // cSlotAreaEnderChest:
cSlotAreaEnderChest::cSlotAreaEnderChest(cEnderChestEntity * a_EnderChest, cWindow & a_ParentWindow) : cSlotAreaEnderChest::cSlotAreaEnderChest(cEnderChestEntity * a_EnderChest, cWindow & a_ParentWindow) :
@ -1527,7 +1527,7 @@ void cSlotAreaEnderChest::SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotAreaFurnace: // cSlotAreaFurnace:
cSlotAreaFurnace::cSlotAreaFurnace(cFurnaceEntity * a_Furnace, cWindow & a_ParentWindow) : cSlotAreaFurnace::cSlotAreaFurnace(cFurnaceEntity * a_Furnace, cWindow & a_ParentWindow) :
@ -1763,7 +1763,7 @@ void cSlotAreaFurnace::HandleSmeltItem(const cItem & a_Result, cPlayer & a_Playe
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotAreaInventoryBase: // cSlotAreaInventoryBase:
cSlotAreaInventoryBase::cSlotAreaInventoryBase(int a_NumSlots, int a_SlotOffset, cWindow & a_ParentWindow) : cSlotAreaInventoryBase::cSlotAreaInventoryBase(int a_NumSlots, int a_SlotOffset, cWindow & a_ParentWindow) :
@ -1819,7 +1819,7 @@ void cSlotAreaInventoryBase::SetSlot(int a_SlotNum, cPlayer & a_Player, const cI
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotAreaArmor: // cSlotAreaArmor:
void cSlotAreaArmor::DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots) void cSlotAreaArmor::DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, bool a_ShouldApply, bool a_KeepEmptySlots)
@ -1948,7 +1948,7 @@ bool cSlotAreaArmor::CanPlaceInSlot(int a_SlotNum, const cItem & a_Item)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotAreaItemGrid: // cSlotAreaItemGrid:
cSlotAreaItemGrid::cSlotAreaItemGrid(cItemGrid & a_ItemGrid, cWindow & a_ParentWindow) : cSlotAreaItemGrid::cSlotAreaItemGrid(cItemGrid & a_ItemGrid, cWindow & a_ParentWindow) :
@ -1999,7 +1999,7 @@ void cSlotAreaItemGrid::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSlotAreaTemporary: // cSlotAreaTemporary:
cSlotAreaTemporary::cSlotAreaTemporary(int a_NumSlots, cWindow & a_ParentWindow) : cSlotAreaTemporary::cSlotAreaTemporary(int a_NumSlots, cWindow & a_ParentWindow) :

18
src/UI/Window.cpp
View File

@ -763,7 +763,7 @@ void cWindow::SetProperty(int a_Property, int a_Value, cPlayer & a_Player)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cInventoryWindow: // cInventoryWindow:
cInventoryWindow::cInventoryWindow(cPlayer & a_Player) : cInventoryWindow::cInventoryWindow(cPlayer & a_Player) :
@ -780,7 +780,7 @@ cInventoryWindow::cInventoryWindow(cPlayer & a_Player) :
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cCraftingWindow: // cCraftingWindow:
cCraftingWindow::cCraftingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) : cCraftingWindow::cCraftingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) :
@ -795,7 +795,7 @@ cCraftingWindow::cCraftingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) :
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cAnvilWindow: // cAnvilWindow:
cAnvilWindow::cAnvilWindow(int a_BlockX, int a_BlockY, int a_BlockZ) : cAnvilWindow::cAnvilWindow(int a_BlockX, int a_BlockY, int a_BlockZ) :
@ -840,7 +840,7 @@ void cAnvilWindow::GetBlockPos(int & a_PosX, int & a_PosY, int & a_PosZ)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEnchantingWindow: // cEnchantingWindow:
cEnchantingWindow::cEnchantingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) : cEnchantingWindow::cEnchantingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) :
@ -901,7 +901,7 @@ void cEnchantingWindow::GetBlockPos(int & a_PosX, int & a_PosY, int & a_PosZ)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cChestWindow: // cChestWindow:
cChestWindow::cChestWindow(cChestEntity * a_Chest) : cChestWindow::cChestWindow(cChestEntity * a_Chest) :
@ -1011,7 +1011,7 @@ cChestWindow::~cChestWindow()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cDropSpenserWindow: // cDropSpenserWindow:
cDropSpenserWindow::cDropSpenserWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cDropSpenserEntity * a_DropSpenser) : cDropSpenserWindow::cDropSpenserWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cDropSpenserEntity * a_DropSpenser) :
@ -1027,7 +1027,7 @@ cDropSpenserWindow::cDropSpenserWindow(int a_BlockX, int a_BlockY, int a_BlockZ,
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cEnderChestWindow: // cEnderChestWindow:
cEnderChestWindow::cEnderChestWindow(cEnderChestEntity * a_EnderChest) : cEnderChestWindow::cEnderChestWindow(cEnderChestEntity * a_EnderChest) :
@ -1065,7 +1065,7 @@ cEnderChestWindow::~cEnderChestWindow()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cHopperWindow: // cHopperWindow:
cHopperWindow::cHopperWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cHopperEntity * a_Hopper) : cHopperWindow::cHopperWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cHopperEntity * a_Hopper) :
@ -1081,7 +1081,7 @@ cHopperWindow::cHopperWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cHopperEn
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFurnaceWindow: // cFurnaceWindow:
cFurnaceWindow::cFurnaceWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cFurnaceEntity * a_Furnace) : cFurnaceWindow::cFurnaceWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cFurnaceEntity * a_Furnace) :

2
src/WebAdmin.cpp
View File

@ -531,7 +531,7 @@ void cWebAdmin::OnRequestFinished(cHTTPConnection & a_Connection, cHTTPRequest &
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWebAdmin::cWebadminRequestData // cWebAdmin::cWebadminRequestData
void cWebAdmin::cWebadminRequestData::OnBody(const char * a_Data, size_t a_Size) void cWebAdmin::cWebadminRequestData::OnBody(const char * a_Data, size_t a_Size)

18
src/World.cpp
View File

@ -70,7 +70,7 @@ const int TIME_SPAWN_DIVISOR = 148;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWorldLoadProgress: // cWorldLoadProgress:
/// A simple thread that displays the progress of world loading / saving in cWorld::InitializeSpawn() /// A simple thread that displays the progress of world loading / saving in cWorld::InitializeSpawn()
@ -122,7 +122,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWorldLightingProgress: // cWorldLightingProgress:
/// A simple thread that displays the progress of world lighting in cWorld::InitializeSpawn() /// A simple thread that displays the progress of world lighting in cWorld::InitializeSpawn()
@ -172,7 +172,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWorld::cLock: // cWorld::cLock:
cWorld::cLock::cLock(cWorld & a_World) : cWorld::cLock::cLock(cWorld & a_World) :
@ -184,7 +184,7 @@ cWorld::cLock::cLock(cWorld & a_World) :
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWorld::cTickThread: // cWorld::cTickThread:
cWorld::cTickThread::cTickThread(cWorld & a_World) : cWorld::cTickThread::cTickThread(cWorld & a_World) :
@ -226,7 +226,7 @@ void cWorld::cTickThread::Execute(void)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWorld: // cWorld:
cWorld::cWorld(const AString & a_WorldName) : cWorld::cWorld(const AString & a_WorldName) :
@ -3200,7 +3200,7 @@ void cWorld::AddQueuedPlayers(void)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWorld::cTaskSaveAllChunks: // cWorld::cTaskSaveAllChunks:
void cWorld::cTaskSaveAllChunks::Run(cWorld & a_World) void cWorld::cTaskSaveAllChunks::Run(cWorld & a_World)
@ -3212,7 +3212,7 @@ void cWorld::cTaskSaveAllChunks::Run(cWorld & a_World)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWorld::cTaskUnloadUnusedChunks // cWorld::cTaskUnloadUnusedChunks
void cWorld::cTaskUnloadUnusedChunks::Run(cWorld & a_World) void cWorld::cTaskUnloadUnusedChunks::Run(cWorld & a_World)
@ -3224,7 +3224,7 @@ void cWorld::cTaskUnloadUnusedChunks::Run(cWorld & a_World)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWorld::cTaskSendBlockTo // cWorld::cTaskSendBlockTo
cWorld::cTaskSendBlockToAllPlayers::cTaskSendBlockToAllPlayers(std::vector<Vector3i> & a_SendQueue) : cWorld::cTaskSendBlockToAllPlayers::cTaskSendBlockToAllPlayers(std::vector<Vector3i> & a_SendQueue) :
@ -3267,7 +3267,7 @@ void cWorld::cTaskSendBlockToAllPlayers::Run(cWorld & a_World)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWorld::cChunkGeneratorCallbacks: // cWorld::cChunkGeneratorCallbacks:
cWorld::cChunkGeneratorCallbacks::cChunkGeneratorCallbacks(cWorld & a_World) : cWorld::cChunkGeneratorCallbacks::cChunkGeneratorCallbacks(cWorld & a_World) :

4
src/WorldStorage/FastNBT.cpp
View File

@ -25,7 +25,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cParsedNBT: // cParsedNBT:
#define NEEDBYTES(N) \ #define NEEDBYTES(N) \
@ -329,7 +329,7 @@ int cParsedNBT::FindTagByPath(int a_Tag, const AString & a_Path) const
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cFastNBTWriter: // cFastNBTWriter:
cFastNBTWriter::cFastNBTWriter(const AString & a_RootTagName) : cFastNBTWriter::cFastNBTWriter(const AString & a_RootTagName) :

2
src/WorldStorage/SchematicFileSerializer.cpp
View File

@ -44,7 +44,7 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cSchematicFileSerializer: // cSchematicFileSerializer:
bool cSchematicFileSerializer::LoadFromSchematicFile(cBlockArea & a_BlockArea, const AString & a_FileName) bool cSchematicFileSerializer::LoadFromSchematicFile(cBlockArea & a_BlockArea, const AString & a_FileName)

4
src/WorldStorage/WSSAnvil.cpp
View File

@ -69,7 +69,7 @@ Since only the header is actually in the memory, this number can be high, but st
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWSSAnvil: // cWSSAnvil:
cWSSAnvil::cWSSAnvil(cWorld * a_World, int a_CompressionFactor) : cWSSAnvil::cWSSAnvil(cWorld * a_World, int a_CompressionFactor) :
@ -2592,7 +2592,7 @@ bool cWSSAnvil::GetBlockEntityNBTPos(const cParsedNBT & a_NBT, int a_TagIdx, int
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWSSAnvil::cMCAFile: // cWSSAnvil::cMCAFile:
cWSSAnvil::cMCAFile::cMCAFile(const AString & a_FileName, int a_RegionX, int a_RegionZ) : cWSSAnvil::cMCAFile::cMCAFile(const AString & a_FileName, int a_RegionX, int a_RegionZ) :

6
src/WorldStorage/WSSCompact.cpp
View File

@ -48,7 +48,7 @@ const int MAX_DIRTY_CHUNKS = 16;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cJsonChunkSerializer: // cJsonChunkSerializer:
cJsonChunkSerializer::cJsonChunkSerializer(void) : cJsonChunkSerializer::cJsonChunkSerializer(void) :
@ -120,7 +120,7 @@ void cJsonChunkSerializer::LightIsValid(bool a_IsLightValid)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWSSCompact: // cWSSCompact:
cWSSCompact::~cWSSCompact() cWSSCompact::~cWSSCompact()
@ -411,7 +411,7 @@ void cWSSCompact::LoadEntitiesFromJson(Json::Value & a_Value, cEntityList & a_En
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWSSCompact::cPAKFile // cWSSCompact::cPAKFile
#define READ(Var) \ #define READ(Var) \

2
src/WorldStorage/WorldStorage.cpp
View File

@ -35,7 +35,7 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// cWorldStorage: // cWorldStorage:
cWorldStorage::cWorldStorage(void) : cWorldStorage::cWorldStorage(void) :

Some files were not shown because too many files have changed in this diff Show More