Normalized comments.
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:
parent
7fff12bfac
commit
2423fbf2ef
@ -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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ bool cLuaChunkStay::AddChunks(int a_ChunkCoordTableStackPos)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cLuaChunkStay::AddChunkCoord(cLuaState & L, int a_Index)
|
void cLuaChunkStay::AddChunkCoord(cLuaState & L, int a_Index)
|
||||||
{
|
{
|
||||||
// Check that the element has 2 coords:
|
// Check that the element has 2 coords:
|
||||||
int NumCoords = luaL_getn(L, -1);
|
int NumCoords = luaL_getn(L, -1);
|
||||||
|
@ -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) :
|
||||||
|
@ -128,7 +128,7 @@ public:
|
|||||||
|
|
||||||
|
|
||||||
/** Creates a new instance. The LuaState is not initialized.
|
/** Creates a new instance. The LuaState is not initialized.
|
||||||
a_SubsystemName is used for reporting problems in the console, it is "plugin %s" for plugins,
|
a_SubsystemName is used for reporting problems in the console, it is "plugin %s" for plugins,
|
||||||
or "LuaScript" for the cLuaScript template
|
or "LuaScript" for the cLuaScript template
|
||||||
*/
|
*/
|
||||||
cLuaState(const AString & a_SubsystemName);
|
cLuaState(const AString & a_SubsystemName);
|
||||||
|
@ -7,13 +7,13 @@
|
|||||||
#include "../UI/SlotArea.h"
|
#include "../UI/SlotArea.h"
|
||||||
#include "PluginLua.h"
|
#include "PluginLua.h"
|
||||||
#include "../Entities/Player.h"
|
#include "../Entities/Player.h"
|
||||||
#include "lua/src/lauxlib.h" // Needed for LUA_REFNIL
|
#include "lua/src/lauxlib.h" // Needed for LUA_REFNIL
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// 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) :
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2114,7 +2114,7 @@ static int tolua_cWebPlugin_GetTabNames(lua_State * tolua_S)
|
|||||||
{
|
{
|
||||||
const AString & FancyName = iter->first;
|
const AString & FancyName = iter->first;
|
||||||
const AString & WebName = iter->second;
|
const AString & WebName = iter->second;
|
||||||
tolua_pushstring( tolua_S, WebName.c_str() ); // Because the WebName is supposed to be unique, use it as key
|
tolua_pushstring( tolua_S, WebName.c_str() ); // Because the WebName is supposed to be unique, use it as key
|
||||||
tolua_pushstring( tolua_S, FancyName.c_str() );
|
tolua_pushstring( tolua_S, FancyName.c_str() );
|
||||||
//
|
//
|
||||||
lua_rawset(tolua_S, -3);
|
lua_rawset(tolua_S, -3);
|
||||||
|
@ -25,7 +25,7 @@ extern "C"
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// cPluginLua:
|
// cPluginLua:
|
||||||
|
|
||||||
cPluginLua::cPluginLua(const AString & a_PluginDirectory) :
|
cPluginLua::cPluginLua(const AString & a_PluginDirectory) :
|
||||||
@ -1670,7 +1670,7 @@ AString cPluginLua::HandleWebRequest(const HTTPRequest * a_Request )
|
|||||||
sWebPluginTab * Tab = 0;
|
sWebPluginTab * Tab = 0;
|
||||||
for (TabList::iterator itr = GetTabs().begin(); itr != GetTabs().end(); ++itr)
|
for (TabList::iterator itr = GetTabs().begin(); itr != GetTabs().end(); ++itr)
|
||||||
{
|
{
|
||||||
if ((*itr)->SafeTitle.compare(SafeTabName) == 0) // This is the one! Rawr
|
if ((*itr)->SafeTitle.compare(SafeTabName) == 0) // This is the one! Rawr
|
||||||
{
|
{
|
||||||
Tab = *itr;
|
Tab = *itr;
|
||||||
break;
|
break;
|
||||||
|
@ -336,7 +336,7 @@ private:
|
|||||||
|
|
||||||
/** Tries to match a_Command to the internal table of commands, if a match is found, the corresponding plugin is called. Returns crExecuted if the command is executed. */
|
/** Tries to match a_Command to the internal table of commands, if a match is found, the corresponding plugin is called. Returns crExecuted if the command is executed. */
|
||||||
cPluginManager::CommandResult HandleCommand(cPlayer * a_Player, const AString & a_Command, bool a_ShouldCheckPermissions);
|
cPluginManager::CommandResult HandleCommand(cPlayer * a_Player, const AString & a_Command, bool a_ShouldCheckPermissions);
|
||||||
} ; // tolua_export
|
} ; // tolua_export
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ std::pair< AString, AString > cWebPlugin::GetTabNameForRequest(const HTTPRequest
|
|||||||
{
|
{
|
||||||
for( TabList::iterator itr = GetTabs().begin(); itr != GetTabs().end(); ++itr )
|
for( TabList::iterator itr = GetTabs().begin(); itr != GetTabs().end(); ++itr )
|
||||||
{
|
{
|
||||||
if( (*itr)->SafeTitle.compare( Split[2] ) == 0 ) // This is the one! Rawr
|
if( (*itr)->SafeTitle.compare( Split[2] ) == 0 ) // This is the one! Rawr
|
||||||
{
|
{
|
||||||
Tab = *itr;
|
Tab = *itr;
|
||||||
break;
|
break;
|
||||||
|
@ -36,7 +36,7 @@ public:
|
|||||||
TabList & GetTabs() { return m_Tabs; }
|
TabList & GetTabs() { return m_Tabs; }
|
||||||
|
|
||||||
typedef std::list< std::pair<AString, AString> > TabNameList;
|
typedef std::list< std::pair<AString, AString> > TabNameList;
|
||||||
TabNameList GetTabNames(); // >> EXPORTED IN MANUALBINDINGS <<
|
TabNameList GetTabNames(); // >> EXPORTED IN MANUALBINDINGS <<
|
||||||
std::pair< AString, AString > GetTabNameForRequest(const HTTPRequest* a_Request );
|
std::pair< AString, AString > GetTabNameForRequest(const HTTPRequest* a_Request );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -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) :
|
||||||
|
@ -50,7 +50,7 @@ public:
|
|||||||
cItems Pickups;
|
cItems Pickups;
|
||||||
m_Contents.CopyToItems(Pickups);
|
m_Contents.CopyToItems(Pickups);
|
||||||
m_Contents.Clear();
|
m_Contents.Clear();
|
||||||
m_World->SpawnItemPickups(Pickups, m_PosX + 0.5, m_PosY + 0.5, m_PosZ + 0.5); // Spawn in centre of block
|
m_World->SpawnItemPickups(Pickups, m_PosX + 0.5, m_PosY + 0.5, m_PosZ + 0.5); // Spawn in centre of block
|
||||||
}
|
}
|
||||||
|
|
||||||
// tolua_begin
|
// tolua_begin
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#include "../CommandOutput.h"
|
#include "../CommandOutput.h"
|
||||||
#include "../Root.h"
|
#include "../Root.h"
|
||||||
#include "../Server.h" // ExecuteConsoleCommand()
|
#include "../Server.h" // ExecuteConsoleCommand()
|
||||||
#include "../Chunk.h"
|
#include "../Chunk.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ cDropSpenserEntity::~cDropSpenserEntity()
|
|||||||
|
|
||||||
void cDropSpenserEntity::AddDropSpenserDir(int & a_BlockX, int & a_BlockY, int & a_BlockZ, NIBBLETYPE a_Direction)
|
void cDropSpenserEntity::AddDropSpenserDir(int & a_BlockX, int & a_BlockY, int & a_BlockZ, NIBBLETYPE a_Direction)
|
||||||
{
|
{
|
||||||
switch (a_Direction & 0x07) // Vanilla uses the 8th bit to determine power state - we don't
|
switch (a_Direction & 0x07) // Vanilla uses the 8th bit to determine power state - we don't
|
||||||
{
|
{
|
||||||
case E_META_DROPSPENSER_FACING_YM: a_BlockY--; return;
|
case E_META_DROPSPENSER_FACING_YM: a_BlockY--; return;
|
||||||
case E_META_DROPSPENSER_FACING_YP: a_BlockY++; return;
|
case E_META_DROPSPENSER_FACING_YP: a_BlockY++; return;
|
||||||
@ -90,7 +90,7 @@ void cDropSpenserEntity::DropSpense(cChunk & a_Chunk)
|
|||||||
int SmokeDir = 0;
|
int SmokeDir = 0;
|
||||||
switch (Meta)
|
switch (Meta)
|
||||||
{
|
{
|
||||||
case E_META_DROPSPENSER_FACING_YP: SmokeDir = 4; break; // YP & YM don't have associated smoke dirs, just do 4 (centre of block)
|
case E_META_DROPSPENSER_FACING_YP: SmokeDir = 4; break; // YP & YM don't have associated smoke dirs, just do 4 (centre of block)
|
||||||
case E_META_DROPSPENSER_FACING_YM: SmokeDir = 4; break;
|
case E_META_DROPSPENSER_FACING_YM: SmokeDir = 4; break;
|
||||||
case E_META_DROPSPENSER_FACING_XM: SmokeDir = 3; break;
|
case E_META_DROPSPENSER_FACING_XM: SmokeDir = 3; break;
|
||||||
case E_META_DROPSPENSER_FACING_XP: SmokeDir = 5; break;
|
case E_META_DROPSPENSER_FACING_XP: SmokeDir = 5; break;
|
||||||
@ -235,7 +235,7 @@ void cDropSpenserEntity::DropFromSlot(cChunk & a_Chunk, int a_SlotNum)
|
|||||||
cItems Pickups;
|
cItems Pickups;
|
||||||
Pickups.push_back(m_Contents.RemoveOneItem(a_SlotNum));
|
Pickups.push_back(m_Contents.RemoveOneItem(a_SlotNum));
|
||||||
|
|
||||||
const int PickupSpeed = m_World->GetTickRandomNumber(4) + 2; // At least 2, at most 6
|
const int PickupSpeed = m_World->GetTickRandomNumber(4) + 2; // At least 2, at most 6
|
||||||
int PickupSpeedX = 0, PickupSpeedY = 0, PickupSpeedZ = 0;
|
int PickupSpeedX = 0, PickupSpeedY = 0, PickupSpeedZ = 0;
|
||||||
switch (Meta)
|
switch (Meta)
|
||||||
{
|
{
|
||||||
@ -249,7 +249,7 @@ void cDropSpenserEntity::DropFromSlot(cChunk & a_Chunk, int a_SlotNum)
|
|||||||
|
|
||||||
double MicroX, MicroY, MicroZ;
|
double MicroX, MicroY, MicroZ;
|
||||||
MicroX = DispX + 0.5;
|
MicroX = DispX + 0.5;
|
||||||
MicroY = DispY + 0.4; // Slightly less than half, to accomodate actual texture hole on DropSpenser
|
MicroY = DispY + 0.4; // Slightly less than half, to accomodate actual texture hole on DropSpenser
|
||||||
MicroZ = DispZ + 0.5;
|
MicroZ = DispZ + 0.5;
|
||||||
|
|
||||||
|
|
||||||
|
@ -219,7 +219,7 @@ bool cHopperEntity::MovePickupsIn(cChunk & a_Chunk, Int64 a_CurrentTick)
|
|||||||
}
|
}
|
||||||
|
|
||||||
Vector3f EntityPos = a_Entity->GetPosition();
|
Vector3f EntityPos = a_Entity->GetPosition();
|
||||||
Vector3f BlockPos(m_Pos.x + 0.5f, (float)m_Pos.y + 1, m_Pos.z + 0.5f); // One block above hopper, and search from center outwards
|
Vector3f BlockPos(m_Pos.x + 0.5f, (float)m_Pos.y + 1, m_Pos.z + 0.5f); // One block above hopper, and search from center outwards
|
||||||
double Distance = (EntityPos - BlockPos).Length();
|
double Distance = (EntityPos - BlockPos).Length();
|
||||||
|
|
||||||
if (Distance < 0.5)
|
if (Distance < 0.5)
|
||||||
@ -243,7 +243,7 @@ bool cHopperEntity::MovePickupsIn(cChunk & a_Chunk, Int64 a_CurrentTick)
|
|||||||
{
|
{
|
||||||
m_bFoundPickupsAbove = true;
|
m_bFoundPickupsAbove = true;
|
||||||
m_Contents.SetSlot(i, Item);
|
m_Contents.SetSlot(i, Item);
|
||||||
a_Pickup->Destroy(); // Kill pickup
|
a_Pickup->Destroy(); // Kill pickup
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -253,11 +253,11 @@ bool cHopperEntity::MovePickupsIn(cChunk & a_Chunk, Int64 a_CurrentTick)
|
|||||||
|
|
||||||
int PreviousCount = m_Contents.GetSlot(i).m_ItemCount;
|
int PreviousCount = m_Contents.GetSlot(i).m_ItemCount;
|
||||||
|
|
||||||
Item.m_ItemCount -= m_Contents.ChangeSlotCount(i, Item.m_ItemCount) - PreviousCount; // Set count to however many items were added
|
Item.m_ItemCount -= m_Contents.ChangeSlotCount(i, Item.m_ItemCount) - PreviousCount; // Set count to however many items were added
|
||||||
|
|
||||||
if (Item.IsEmpty())
|
if (Item.IsEmpty())
|
||||||
{
|
{
|
||||||
a_Pickup->Destroy(); // Kill pickup if all items were added
|
a_Pickup->Destroy(); // Kill pickup if all items were added
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -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:
|
||||||
|
@ -122,16 +122,16 @@ void cBlockBedHandler::OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Is foot end
|
// Is foot end
|
||||||
VERIFY((Meta & 0x4) != 0x4); // Occupied flag should never be set, else our compilator (intended) is broken
|
VERIFY((Meta & 0x4) != 0x4); // Occupied flag should never be set, else our compilator (intended) is broken
|
||||||
|
|
||||||
PillowDirection = MetaDataToDirection(Meta & 0x7);
|
PillowDirection = MetaDataToDirection(Meta & 0x7);
|
||||||
if (a_ChunkInterface.GetBlock(a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z) == E_BLOCK_BED) // Must always use pillow location for sleeping
|
if (a_ChunkInterface.GetBlock(a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z) == E_BLOCK_BED) // Must always use pillow location for sleeping
|
||||||
{
|
{
|
||||||
a_WorldInterface.GetBroadcastManager().BroadcastUseBed(*a_Player, a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z);
|
a_WorldInterface.GetBroadcastManager().BroadcastUseBed(*a_Player, a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta | 0x4); // Where 0x4 = occupied bit
|
a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta | 0x4); // Where 0x4 = occupied bit
|
||||||
a_Player->SetIsInBed(true);
|
a_Player->SetIsInBed(true);
|
||||||
|
|
||||||
cTimeFastForwardTester Tester;
|
cTimeFastForwardTester Tester;
|
||||||
@ -140,7 +140,7 @@ void cBlockBedHandler::OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface
|
|||||||
cPlayerBedStateUnsetter Unsetter(Vector3i(a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z), a_WorldInterface);
|
cPlayerBedStateUnsetter Unsetter(Vector3i(a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z), a_WorldInterface);
|
||||||
a_WorldInterface.ForEachPlayer(Unsetter);
|
a_WorldInterface.ForEachPlayer(Unsetter);
|
||||||
a_WorldInterface.SetTimeOfDay(0);
|
a_WorldInterface.SetTimeOfDay(0);
|
||||||
a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta & 0xB); // Where 0xB = 1011, and zero is to make sure 'occupied' bit is always unset
|
a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta & 0xB); // Where 0xB = 1011, and zero is to make sure 'occupied' bit is always unset
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -74,7 +74,7 @@ public:
|
|||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
ASSERT(!"Unhandled block face!");
|
ASSERT(!"Unhandled block face!");
|
||||||
return 0x0; // No idea, give a special meta (button in centre of block)
|
return 0x0; // No idea, give a special meta (button in centre of block)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ public:
|
|||||||
virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
|
virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
|
||||||
{
|
{
|
||||||
NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
|
NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
|
||||||
Meta ^= 0x04; // Toggle 3rd (addition/subtraction) bit with XOR
|
Meta ^= 0x04; // Toggle 3rd (addition/subtraction) bit with XOR
|
||||||
a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta);
|
a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,8 +43,8 @@ public:
|
|||||||
// Mirrors defined by by a table. (Source, mincraft.gamepedia.com) 0x07 == 0111
|
// Mirrors defined by by a table. (Source, mincraft.gamepedia.com) 0x07 == 0111
|
||||||
switch (a_Meta & 0x07)
|
switch (a_Meta & 0x07)
|
||||||
{
|
{
|
||||||
case 0x00: return 0x01 + OtherMeta; // Down -> Up
|
case 0x00: return 0x01 + OtherMeta; // Down -> Up
|
||||||
case 0x01: return 0x00 + OtherMeta; // Up -> Down
|
case 0x01: return 0x00 + OtherMeta; // Up -> Down
|
||||||
}
|
}
|
||||||
// Not Facing Up or Down; No change.
|
// Not Facing Up or Down; No change.
|
||||||
return a_Meta;
|
return a_Meta;
|
||||||
|
@ -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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -106,7 +106,7 @@ public:
|
|||||||
|
|
||||||
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
||||||
{
|
{
|
||||||
a_Pickups.Add(E_BLOCK_DIRT, 1, 0); // Reset meta
|
a_Pickups.Add(E_BLOCK_DIRT, 1, 0); // Reset meta
|
||||||
}
|
}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ public:
|
|||||||
/// Evaluates if coords have a valid border on top, based on MaxY
|
/// Evaluates if coords have a valid border on top, based on MaxY
|
||||||
bool EvaluatePortalBorder(int X, int FoundObsidianY, int Z, int MaxY, cChunkInterface & a_ChunkInterface)
|
bool EvaluatePortalBorder(int X, int FoundObsidianY, int Z, int MaxY, cChunkInterface & a_ChunkInterface)
|
||||||
{
|
{
|
||||||
for (int checkBorder = FoundObsidianY + 1; checkBorder <= MaxY - 1; checkBorder++) // FoundObsidianY + 1: FoundObsidianY has already been checked in FindObsidianCeiling; MaxY - 1: portal doesn't need corners
|
for (int checkBorder = FoundObsidianY + 1; checkBorder <= MaxY - 1; checkBorder++) // FoundObsidianY + 1: FoundObsidianY has already been checked in FindObsidianCeiling; MaxY - 1: portal doesn't need corners
|
||||||
{
|
{
|
||||||
if (a_ChunkInterface.GetBlock(X, checkBorder, Z) != E_BLOCK_OBSIDIAN)
|
if (a_ChunkInterface.GetBlock(X, checkBorder, Z) != E_BLOCK_OBSIDIAN)
|
||||||
{
|
{
|
||||||
@ -115,10 +115,10 @@ public:
|
|||||||
/// Finds entire frame in any direction with the coordinates of a base block and fills hole with nether portal (START HERE)
|
/// Finds entire frame in any direction with the coordinates of a base block and fills hole with nether portal (START HERE)
|
||||||
void FindAndSetPortalFrame(int X, int Y, int Z, cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface)
|
void FindAndSetPortalFrame(int X, int Y, int Z, cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface)
|
||||||
{
|
{
|
||||||
int MaxY = FindObsidianCeiling(X, Y, Z, a_ChunkInterface); // Get topmost obsidian block as reference for all other checks
|
int MaxY = FindObsidianCeiling(X, Y, Z, a_ChunkInterface); // Get topmost obsidian block as reference for all other checks
|
||||||
int X1 = X + 1, Z1 = Z + 1, X2 = X - 1, Z2 = Z - 1; // Duplicate XZ values, add/subtract one as we've checked the original already the line above
|
int X1 = X + 1, Z1 = Z + 1, X2 = X - 1, Z2 = Z - 1; // Duplicate XZ values, add/subtract one as we've checked the original already the line above
|
||||||
|
|
||||||
if (MaxY == 0) // Oh noes! Not a portal coordinate :(
|
if (MaxY == 0) // Oh noes! Not a portal coordinate :(
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -127,11 +127,11 @@ public:
|
|||||||
{
|
{
|
||||||
if (!FindPortalSliceZ(X, Y, Z1, Z2, MaxY, a_ChunkInterface))
|
if (!FindPortalSliceZ(X, Y, Z1, Z2, MaxY, a_ChunkInterface))
|
||||||
{
|
{
|
||||||
return; // No eligible portal construct, abort abort abort!!
|
return; // No eligible portal construct, abort abort abort!!
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int Height = Y + 1; Height <= MaxY - 1; Height++) // Loop through boundary to set portal blocks
|
for (int Height = Y + 1; Height <= MaxY - 1; Height++) // Loop through boundary to set portal blocks
|
||||||
{
|
{
|
||||||
for (int Width = XZM; Width <= XZP; Width++)
|
for (int Width = XZM; Width <= XZP; Width++)
|
||||||
{
|
{
|
||||||
@ -153,23 +153,23 @@ public:
|
|||||||
/// Takes coordinates of base block and Y coord of target obsidian ceiling
|
/// Takes coordinates of base block and Y coord of target obsidian ceiling
|
||||||
bool FindPortalSliceX(int X1, int X2, int Y, int Z, int MaxY, cChunkInterface & a_ChunkInterface)
|
bool FindPortalSliceX(int X1, int X2, int Y, int Z, int MaxY, cChunkInterface & a_ChunkInterface)
|
||||||
{
|
{
|
||||||
Dir = 1; // Set assumed direction (will change if portal turns out to be facing the other direction)
|
Dir = 1; // Set assumed direction (will change if portal turns out to be facing the other direction)
|
||||||
bool FoundFrameXP = false, FoundFrameXM = false;
|
bool FoundFrameXP = false, FoundFrameXM = false;
|
||||||
for (; ((a_ChunkInterface.GetBlock(X1, Y, Z) == E_BLOCK_OBSIDIAN) || (a_ChunkInterface.GetBlock(X1, Y + 1, Z) == E_BLOCK_OBSIDIAN)); X1++) // Check XP for obsidian blocks, exempting corners
|
for (; ((a_ChunkInterface.GetBlock(X1, Y, Z) == E_BLOCK_OBSIDIAN) || (a_ChunkInterface.GetBlock(X1, Y + 1, Z) == E_BLOCK_OBSIDIAN)); X1++) // Check XP for obsidian blocks, exempting corners
|
||||||
{
|
{
|
||||||
int Value = FindObsidianCeiling(X1, Y, Z, a_ChunkInterface, MaxY);
|
int Value = FindObsidianCeiling(X1, Y, Z, a_ChunkInterface, MaxY);
|
||||||
int ValueTwo = FindObsidianCeiling(X1, Y + 1, Z, a_ChunkInterface, MaxY); // For corners without obsidian
|
int ValueTwo = FindObsidianCeiling(X1, Y + 1, Z, a_ChunkInterface, MaxY); // For corners without obsidian
|
||||||
if ((Value == -1) || (ValueTwo == -1)) // FindObsidianCeiling returns -1 upon frame-find
|
if ((Value == -1) || (ValueTwo == -1)) // FindObsidianCeiling returns -1 upon frame-find
|
||||||
{
|
{
|
||||||
FoundFrameXP = true; // Found a frame border in this direction, proceed in other direction (don't go further)
|
FoundFrameXP = true; // Found a frame border in this direction, proceed in other direction (don't go further)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if ((Value != MaxY) && (ValueTwo != MaxY)) // Make sure that there is a valid portal 'slice'
|
else if ((Value != MaxY) && (ValueTwo != MaxY)) // Make sure that there is a valid portal 'slice'
|
||||||
{
|
{
|
||||||
return false; // Not valid slice, no portal can be formed
|
return false; // Not valid slice, no portal can be formed
|
||||||
}
|
}
|
||||||
} XZP = X1 - 1; // Set boundary of frame interior
|
} XZP = X1 - 1; // Set boundary of frame interior
|
||||||
for (; ((a_ChunkInterface.GetBlock(X2, Y, Z) == E_BLOCK_OBSIDIAN) || (a_ChunkInterface.GetBlock(X2, Y + 1, Z) == E_BLOCK_OBSIDIAN)); X2--) // Go the other direction (XM)
|
for (; ((a_ChunkInterface.GetBlock(X2, Y, Z) == E_BLOCK_OBSIDIAN) || (a_ChunkInterface.GetBlock(X2, Y + 1, Z) == E_BLOCK_OBSIDIAN)); X2--) // Go the other direction (XM)
|
||||||
{
|
{
|
||||||
int Value = FindObsidianCeiling(X2, Y, Z, a_ChunkInterface, MaxY);
|
int Value = FindObsidianCeiling(X2, Y, Z, a_ChunkInterface, MaxY);
|
||||||
int ValueTwo = FindObsidianCeiling(X2, Y + 1, Z, a_ChunkInterface, MaxY);
|
int ValueTwo = FindObsidianCeiling(X2, Y + 1, Z, a_ChunkInterface, MaxY);
|
||||||
@ -182,7 +182,7 @@ public:
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} XZM = X2 + 1; // Set boundary, see previous
|
} XZM = X2 + 1; // Set boundary, see previous
|
||||||
return (FoundFrameXP && FoundFrameXM);
|
return (FoundFrameXP && FoundFrameXM);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ public:
|
|||||||
|
|
||||||
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
||||||
{
|
{
|
||||||
a_Pickups.Add(m_BlockType, 1, 0); // Reset meta
|
a_Pickups.Add(m_BlockType, 1, 0); // Reset meta
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ public:
|
|||||||
virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override
|
virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override
|
||||||
{
|
{
|
||||||
NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
|
NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
|
||||||
a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta & 0x7); // Unset 0x8 bit so it gets checked for decay
|
a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta & 0x7); // Unset 0x8 bit so it gets checked for decay
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -235,7 +235,7 @@ void cBlockPistonHandler::RetractPiston(int a_BlockX, int a_BlockY, int a_BlockZ
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// cBlockPistonHeadHandler:
|
// cBlockPistonHeadHandler:
|
||||||
|
|
||||||
cBlockPistonHeadHandler::cBlockPistonHeadHandler(void) :
|
cBlockPistonHeadHandler::cBlockPistonHeadHandler(void) :
|
||||||
@ -262,7 +262,7 @@ void cBlockPistonHeadHandler::OnDestroyedByPlayer(cChunkInterface & a_ChunkInter
|
|||||||
a_ChunkInterface.DigBlock(a_WorldInterface, newX, newY, newZ);
|
a_ChunkInterface.DigBlock(a_WorldInterface, newX, newY, newZ);
|
||||||
if (a_Player->IsGameModeCreative())
|
if (a_Player->IsGameModeCreative())
|
||||||
{
|
{
|
||||||
return; // No pickups if creative
|
return; // No pickups if creative
|
||||||
}
|
}
|
||||||
|
|
||||||
cItems Pickups;
|
cItems Pickups;
|
||||||
|
@ -132,7 +132,7 @@ private:
|
|||||||
{
|
{
|
||||||
if (cBlockInfo::IsPistonBreakable(a_BlockType))
|
if (cBlockInfo::IsPistonBreakable(a_BlockType))
|
||||||
{
|
{
|
||||||
return false; // CanBreakPush returns true, but we need false to prevent pulling
|
return false; // CanBreakPush returns true, but we need false to prevent pulling
|
||||||
}
|
}
|
||||||
|
|
||||||
return CanPush(a_BlockType, a_BlockMeta);
|
return CanPush(a_BlockType, a_BlockMeta);
|
||||||
|
@ -36,7 +36,7 @@ public:
|
|||||||
|
|
||||||
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
||||||
{
|
{
|
||||||
return; // No pickups
|
return; // No pickups
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
|
virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
|
||||||
@ -57,7 +57,7 @@ public:
|
|||||||
{
|
{
|
||||||
if ((a_RelY - 1 < 0) || (a_RelY + 1 > cChunkDef::Height))
|
if ((a_RelY - 1 < 0) || (a_RelY + 1 > cChunkDef::Height))
|
||||||
{
|
{
|
||||||
return false; // In case someone places a portal with meta 1 or 2 at boundaries, and server tries to get invalid coords at Y - 1 or Y + 1
|
return false; // In case someone places a portal with meta 1 or 2 at boundaries, and server tries to get invalid coords at Y - 1 or Y + 1
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ))
|
switch (a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ))
|
||||||
|
@ -25,7 +25,7 @@ public:
|
|||||||
{
|
{
|
||||||
a_BlockType = m_BlockType;
|
a_BlockType = m_BlockType;
|
||||||
NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage);
|
NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage);
|
||||||
if (Meta != E_META_QUARTZ_PILLAR) // Check if the block is a pillar block.
|
if (Meta != E_META_QUARTZ_PILLAR) // Check if the block is a pillar block.
|
||||||
{
|
{
|
||||||
a_BlockMeta = Meta;
|
a_BlockMeta = Meta;
|
||||||
return true;
|
return true;
|
||||||
@ -42,25 +42,25 @@ public:
|
|||||||
case BLOCK_FACE_YM:
|
case BLOCK_FACE_YM:
|
||||||
case BLOCK_FACE_YP:
|
case BLOCK_FACE_YP:
|
||||||
{
|
{
|
||||||
return a_QuartzMeta; // Top or bottom, just return original
|
return a_QuartzMeta; // Top or bottom, just return original
|
||||||
}
|
}
|
||||||
|
|
||||||
case BLOCK_FACE_ZP:
|
case BLOCK_FACE_ZP:
|
||||||
case BLOCK_FACE_ZM:
|
case BLOCK_FACE_ZM:
|
||||||
{
|
{
|
||||||
return 0x4; // North or south
|
return 0x4; // North or south
|
||||||
}
|
}
|
||||||
|
|
||||||
case BLOCK_FACE_XP:
|
case BLOCK_FACE_XP:
|
||||||
case BLOCK_FACE_XM:
|
case BLOCK_FACE_XM:
|
||||||
{
|
{
|
||||||
return 0x3; // East or west
|
return 0x3; // East or west
|
||||||
}
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
ASSERT(!"Unhandled block face!");
|
ASSERT(!"Unhandled block face!");
|
||||||
return a_QuartzMeta; // No idea, give a special meta (all sides the same)
|
return a_QuartzMeta; // No idea, give a special meta (all sides the same)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -140,7 +140,7 @@ public:
|
|||||||
{
|
{
|
||||||
NIBBLETYPE Meta = 0;
|
NIBBLETYPE Meta = 0;
|
||||||
char RailsCnt = 0;
|
char RailsCnt = 0;
|
||||||
bool Neighbors[8]; // 0 - EAST, 1 - WEST, 2 - NORTH, 3 - SOUTH, 4 - EAST UP, 5 - WEST UP, 6 - NORTH UP, 7 - SOUTH UP
|
bool Neighbors[8]; // 0 - EAST, 1 - WEST, 2 - NORTH, 3 - SOUTH, 4 - EAST UP, 5 - WEST UP, 6 - NORTH UP, 7 - SOUTH UP
|
||||||
memset(Neighbors, 0, sizeof(Neighbors));
|
memset(Neighbors, 0, sizeof(Neighbors));
|
||||||
Neighbors[0] = (IsUnstable(a_ChunkInterface, a_BlockX + 1, a_BlockY, a_BlockZ) || !IsNotConnected(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ, BLOCK_FACE_EAST, E_PURE_DOWN));
|
Neighbors[0] = (IsUnstable(a_ChunkInterface, a_BlockX + 1, a_BlockY, a_BlockZ) || !IsNotConnected(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ, BLOCK_FACE_EAST, E_PURE_DOWN));
|
||||||
Neighbors[1] = (IsUnstable(a_ChunkInterface, a_BlockX - 1, a_BlockY, a_BlockZ) || !IsNotConnected(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ, BLOCK_FACE_WEST, E_PURE_DOWN));
|
Neighbors[1] = (IsUnstable(a_ChunkInterface, a_BlockX - 1, a_BlockY, a_BlockZ) || !IsNotConnected(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ, BLOCK_FACE_WEST, E_PURE_DOWN));
|
||||||
|
@ -71,7 +71,7 @@ public:
|
|||||||
|
|
||||||
inline static NIBBLETYPE RepeaterRotationToMetaData(double a_Rotation)
|
inline static NIBBLETYPE RepeaterRotationToMetaData(double a_Rotation)
|
||||||
{
|
{
|
||||||
a_Rotation += 90 + 45; // So its not aligned with axis
|
a_Rotation += 90 + 45; // So its not aligned with axis
|
||||||
if (a_Rotation > 360)
|
if (a_Rotation > 360)
|
||||||
{
|
{
|
||||||
a_Rotation -= 360;
|
a_Rotation -= 360;
|
||||||
|
@ -32,7 +32,7 @@ public:
|
|||||||
|
|
||||||
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
||||||
{
|
{
|
||||||
a_Pickups.Add(m_BlockType, 1, a_BlockMeta & 0x3); // Reset meta
|
a_Pickups.Add(m_BlockType, 1, a_BlockMeta & 0x3); // Reset meta
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -43,25 +43,25 @@ public:
|
|||||||
case BLOCK_FACE_YM:
|
case BLOCK_FACE_YM:
|
||||||
case BLOCK_FACE_YP:
|
case BLOCK_FACE_YP:
|
||||||
{
|
{
|
||||||
return a_Meta; // Top or bottom, just return original
|
return a_Meta; // Top or bottom, just return original
|
||||||
}
|
}
|
||||||
|
|
||||||
case BLOCK_FACE_ZP:
|
case BLOCK_FACE_ZP:
|
||||||
case BLOCK_FACE_ZM:
|
case BLOCK_FACE_ZM:
|
||||||
{
|
{
|
||||||
return a_Meta | 0x8; // North or south
|
return a_Meta | 0x8; // North or south
|
||||||
}
|
}
|
||||||
|
|
||||||
case BLOCK_FACE_XP:
|
case BLOCK_FACE_XP:
|
||||||
case BLOCK_FACE_XM:
|
case BLOCK_FACE_XM:
|
||||||
{
|
{
|
||||||
return a_Meta | 0x4; // East or west
|
return a_Meta | 0x4; // East or west
|
||||||
}
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
ASSERT(!"Unhandled block face!");
|
ASSERT(!"Unhandled block face!");
|
||||||
return a_Meta | 0xC; // No idea, give a special meta
|
return a_Meta | 0xC; // No idea, give a special meta
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -47,12 +47,12 @@ public:
|
|||||||
{
|
{
|
||||||
if ((a_Player->GetEquippedItem().m_ItemType == E_BLOCK_SNOW) && (a_Meta < 7))
|
if ((a_Player->GetEquippedItem().m_ItemType == E_BLOCK_SNOW) && (a_Meta < 7))
|
||||||
{
|
{
|
||||||
return true; // If a player is holding a (thin) snow block and it's size can be increased, return collision ignored
|
return true; // If a player is holding a (thin) snow block and it's size can be increased, return collision ignored
|
||||||
}
|
}
|
||||||
|
|
||||||
if (a_Meta == 0)
|
if (a_Meta == 0)
|
||||||
{
|
{
|
||||||
return true; // If at normal snowfall height (lowest), we ignore collision
|
return true; // If at normal snowfall height (lowest), we ignore collision
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -85,7 +85,7 @@ public:
|
|||||||
|
|
||||||
static NIBBLETYPE RotationToMetaData(double a_Rotation)
|
static NIBBLETYPE RotationToMetaData(double a_Rotation)
|
||||||
{
|
{
|
||||||
a_Rotation += 90 + 45; // So its not aligned with axis
|
a_Rotation += 90 + 45; // So its not aligned with axis
|
||||||
if (a_Rotation > 360)
|
if (a_Rotation > 360)
|
||||||
{
|
{
|
||||||
a_Rotation -= 360;
|
a_Rotation -= 360;
|
||||||
|
@ -28,7 +28,7 @@ public:
|
|||||||
|
|
||||||
if ((a_BlockFace == BLOCK_FACE_TOP) || (a_BlockFace == BLOCK_FACE_BOTTOM))
|
if ((a_BlockFace == BLOCK_FACE_TOP) || (a_BlockFace == BLOCK_FACE_BOTTOM))
|
||||||
{
|
{
|
||||||
a_BlockFace = FindSuitableFace(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ); // Top or bottom faces clicked, find a suitable face
|
a_BlockFace = FindSuitableFace(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ); // Top or bottom faces clicked, find a suitable face
|
||||||
if (a_BlockFace == BLOCK_FACE_NONE)
|
if (a_BlockFace == BLOCK_FACE_NONE)
|
||||||
{
|
{
|
||||||
// Client wouldn't have sent anything anyway, but whatever
|
// Client wouldn't have sent anything anyway, but whatever
|
||||||
@ -38,10 +38,10 @@ public:
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Not top or bottom faces, try to preserve whatever face was clicked
|
// Not top or bottom faces, try to preserve whatever face was clicked
|
||||||
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, true); // Set to clicked block
|
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, true); // Set to clicked block
|
||||||
if (!CanBePlacedOn(a_ChunkInterface.GetBlock(a_BlockX, a_BlockY, a_BlockZ), a_BlockFace))
|
if (!CanBePlacedOn(a_ChunkInterface.GetBlock(a_BlockX, a_BlockY, a_BlockZ), a_BlockFace))
|
||||||
{
|
{
|
||||||
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, false); // Reset to torch block
|
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, false); // Reset to torch block
|
||||||
// Torch couldn't be placed on whatever face was clicked, last ditch resort - find another face
|
// Torch couldn't be placed on whatever face was clicked, last ditch resort - find another face
|
||||||
a_BlockFace = FindSuitableFace(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ);
|
a_BlockFace = FindSuitableFace(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ);
|
||||||
if (a_BlockFace == BLOCK_FACE_NONE)
|
if (a_BlockFace == BLOCK_FACE_NONE)
|
||||||
@ -113,13 +113,13 @@ public:
|
|||||||
/// Finds a suitable face to place the torch, returning BLOCK_FACE_NONE on failure
|
/// Finds a suitable face to place the torch, returning BLOCK_FACE_NONE on failure
|
||||||
static eBlockFace FindSuitableFace(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ)
|
static eBlockFace FindSuitableFace(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ)
|
||||||
{
|
{
|
||||||
for (int i = BLOCK_FACE_YM; i <= BLOCK_FACE_XP; i++) // Loop through all directions
|
for (int i = BLOCK_FACE_YM; i <= BLOCK_FACE_XP; i++) // Loop through all directions
|
||||||
{
|
{
|
||||||
eBlockFace Face = static_cast<eBlockFace>(i);
|
eBlockFace Face = static_cast<eBlockFace>(i);
|
||||||
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, Face, true);
|
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, Face, true);
|
||||||
BLOCKTYPE BlockInQuestion = a_ChunkInterface.GetBlock(a_BlockX, a_BlockY, a_BlockZ);
|
BLOCKTYPE BlockInQuestion = a_ChunkInterface.GetBlock(a_BlockX, a_BlockY, a_BlockZ);
|
||||||
|
|
||||||
if ( // If on a block that can only hold a torch if torch is standing on it, return that face
|
if ( // If on a block that can only hold a torch if torch is standing on it, return that face
|
||||||
((BlockInQuestion == E_BLOCK_GLASS) ||
|
((BlockInQuestion == E_BLOCK_GLASS) ||
|
||||||
(BlockInQuestion == E_BLOCK_FENCE) ||
|
(BlockInQuestion == E_BLOCK_FENCE) ||
|
||||||
(BlockInQuestion == E_BLOCK_NETHER_BRICK_FENCE) ||
|
(BlockInQuestion == E_BLOCK_NETHER_BRICK_FENCE) ||
|
||||||
@ -158,7 +158,7 @@ public:
|
|||||||
(BlockInQuestion == E_BLOCK_FENCE) ||
|
(BlockInQuestion == E_BLOCK_FENCE) ||
|
||||||
(BlockInQuestion == E_BLOCK_SOULSAND) ||
|
(BlockInQuestion == E_BLOCK_SOULSAND) ||
|
||||||
(BlockInQuestion == E_BLOCK_MOB_SPAWNER) ||
|
(BlockInQuestion == E_BLOCK_MOB_SPAWNER) ||
|
||||||
(BlockInQuestion == E_BLOCK_END_PORTAL_FRAME) || // Actual vanilla behaviour
|
(BlockInQuestion == E_BLOCK_END_PORTAL_FRAME) || // Actual vanilla behaviour
|
||||||
(BlockInQuestion == E_BLOCK_NETHER_BRICK_FENCE) ||
|
(BlockInQuestion == E_BLOCK_NETHER_BRICK_FENCE) ||
|
||||||
(BlockInQuestion == E_BLOCK_COBBLESTONE_WALL)
|
(BlockInQuestion == E_BLOCK_COBBLESTONE_WALL)
|
||||||
)
|
)
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
// MSVC generates warnings for the templated AssertIfNotMatched parameter conditions, so disable it:
|
// MSVC generates warnings for the templated AssertIfNotMatched parameter conditions, so disable it:
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning(disable: 4127) // Conditional expression is constant
|
#pragma warning(disable: 4127) // Conditional expression is constant
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -140,7 +140,7 @@ protected:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// cByteBuffer:
|
// cByteBuffer:
|
||||||
|
|
||||||
cByteBuffer::cByteBuffer(size_t a_BufferSize) :
|
cByteBuffer::cByteBuffer(size_t a_BufferSize) :
|
||||||
|
@ -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(
|
||||||
|
@ -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) :
|
||||||
|
@ -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) :
|
||||||
|
@ -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)
|
||||||
|
@ -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) :
|
||||||
|
@ -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)
|
||||||
|
@ -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)
|
||||||
|
@ -75,12 +75,12 @@ void cArrowEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFa
|
|||||||
{
|
{
|
||||||
if (GetSpeed().EqualsEps(Vector3d(0, 0, 0), 0.0000001))
|
if (GetSpeed().EqualsEps(Vector3d(0, 0, 0), 0.0000001))
|
||||||
{
|
{
|
||||||
SetSpeed(GetLookVector().NormalizeCopy() * 0.1); // Ensure that no division by zero happens later
|
SetSpeed(GetLookVector().NormalizeCopy() * 0.1); // Ensure that no division by zero happens later
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector3d Hit = a_HitPos;
|
Vector3d Hit = a_HitPos;
|
||||||
Vector3d SinkMovement = (GetSpeed() / 1000);
|
Vector3d SinkMovement = (GetSpeed() / 1000);
|
||||||
Hit += SinkMovement * (0.0005 / SinkMovement.Length()); // Make arrow sink into block a centimetre so it lodges (but not to far so it goes black clientside)
|
Hit += SinkMovement * (0.0005 / SinkMovement.Length()); // Make arrow sink into block a centimetre so it lodges (but not to far so it goes black clientside)
|
||||||
|
|
||||||
super::OnHitSolidBlock(Hit, a_HitFace);
|
super::OnHitSolidBlock(Hit, a_HitFace);
|
||||||
Vector3i BlockHit = Hit.Floor();
|
Vector3i BlockHit = Hit.Floor();
|
||||||
@ -166,9 +166,9 @@ void cArrowEntity::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
// We can afford to do this because xoft's algorithm for trajectory is near perfect, so things are pretty close anyway without sync
|
// We can afford to do this because xoft's algorithm for trajectory is near perfect, so things are pretty close anyway without sync
|
||||||
// Besides, this seems to be what the vanilla server does, note how arrows teleport half a second after they hit to the server position
|
// Besides, this seems to be what the vanilla server does, note how arrows teleport half a second after they hit to the server position
|
||||||
|
|
||||||
if (!m_HasTeleported) // Sent a teleport already, don't do again
|
if (!m_HasTeleported) // Sent a teleport already, don't do again
|
||||||
{
|
{
|
||||||
if (m_HitGroundTimer > 500.f) // Send after half a second, could be less, but just in case
|
if (m_HitGroundTimer > 500.f) // Send after half a second, could be less, but just in case
|
||||||
{
|
{
|
||||||
m_World->BroadcastTeleportEntity(*this);
|
m_World->BroadcastTeleportEntity(*this);
|
||||||
m_HasTeleported = true;
|
m_HasTeleported = true;
|
||||||
@ -189,9 +189,9 @@ void cArrowEntity::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Chunk->GetBlock(RelPosX, m_HitBlockPos.y, RelPosZ) == E_BLOCK_AIR) // Block attached to was destroyed?
|
if (Chunk->GetBlock(RelPosX, m_HitBlockPos.y, RelPosZ) == E_BLOCK_AIR) // Block attached to was destroyed?
|
||||||
{
|
{
|
||||||
m_IsInGround = false; // Yes, begin simulating physics again
|
m_IsInGround = false; // Yes, begin simulating physics again
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -99,4 +99,4 @@ protected:
|
|||||||
virtual void CollectedBy(cPlayer * a_Player) override;
|
virtual void CollectedBy(cPlayer * a_Player) override;
|
||||||
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
||||||
|
|
||||||
}; // tolua_export
|
}; // tolua_export
|
||||||
|
@ -94,7 +94,7 @@ void cBoat::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
super::Tick(a_Dt, a_Chunk);
|
super::Tick(a_Dt, a_Chunk);
|
||||||
BroadcastMovementUpdate();
|
BroadcastMovementUpdate();
|
||||||
|
|
||||||
SetSpeed(GetSpeed() * 0.97); // Slowly decrease the speed
|
SetSpeed(GetSpeed() * 0.97); // Slowly decrease the speed
|
||||||
|
|
||||||
if ((POSY_TOINT < 0) || (POSY_TOINT > cChunkDef::Height))
|
if ((POSY_TOINT < 0) || (POSY_TOINT > cChunkDef::Height))
|
||||||
{
|
{
|
||||||
|
@ -272,7 +272,7 @@ void cEntity::SetYawFromSpeed(void)
|
|||||||
void cEntity::SetPitchFromSpeed(void)
|
void cEntity::SetPitchFromSpeed(void)
|
||||||
{
|
{
|
||||||
const double EPS = 0.0000001;
|
const double EPS = 0.0000001;
|
||||||
double xz = sqrt(m_Speed.x * m_Speed.x + m_Speed.z * m_Speed.z); // Speed XZ-plane component
|
double xz = sqrt(m_Speed.x * m_Speed.x + m_Speed.z * m_Speed.z); // Speed XZ-plane component
|
||||||
if ((abs(xz) < EPS) && (abs(m_Speed.y) < EPS))
|
if ((abs(xz) < EPS) && (abs(m_Speed.y) < EPS))
|
||||||
{
|
{
|
||||||
// atan2() may overflow or is undefined, pick any number
|
// atan2() may overflow or is undefined, pick any number
|
||||||
@ -316,7 +316,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
|
|||||||
if ((a_TDI.DamageType == dtAttack) || (a_TDI.DamageType == dtArrowAttack))
|
if ((a_TDI.DamageType == dtAttack) || (a_TDI.DamageType == dtArrowAttack))
|
||||||
{
|
{
|
||||||
a_TDI.FinalDamage += 2;
|
a_TDI.FinalDamage += 2;
|
||||||
m_World->BroadcastEntityAnimation(*this, 4); // Critical hit
|
m_World->BroadcastEntityAnimation(*this, 4); // Critical hit
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -332,7 +332,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
|
|||||||
m_Health = 0;
|
m_Health = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((IsMob() || IsPlayer()) && (a_TDI.Attacker != NULL)) // Knockback for only players and mobs
|
if ((IsMob() || IsPlayer()) && (a_TDI.Attacker != NULL)) // Knockback for only players and mobs
|
||||||
{
|
{
|
||||||
int KnockbackLevel = 0;
|
int KnockbackLevel = 0;
|
||||||
if (a_TDI.Attacker->GetEquippedWeapon().m_ItemType == E_ITEM_BOW)
|
if (a_TDI.Attacker->GetEquippedWeapon().m_ItemType == E_ITEM_BOW)
|
||||||
@ -767,11 +767,11 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
|
|||||||
NextSpeed.x *= 0.25;
|
NextSpeed.x *= 0.25;
|
||||||
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)
|
||||||
{
|
{
|
||||||
@ -828,7 +828,7 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
|
|||||||
if (Tracer.HitNormal.y != 0.f) NextSpeed.y = 0.f;
|
if (Tracer.HitNormal.y != 0.f) NextSpeed.y = 0.f;
|
||||||
if (Tracer.HitNormal.z != 0.f) NextSpeed.z = 0.f;
|
if (Tracer.HitNormal.z != 0.f) NextSpeed.z = 0.f;
|
||||||
|
|
||||||
if (Tracer.HitNormal.y == 1) // Hit BLOCK_FACE_YP, we are on the ground
|
if (Tracer.HitNormal.y == 1) // Hit BLOCK_FACE_YP, we are on the ground
|
||||||
{
|
{
|
||||||
m_bOnGround = true;
|
m_bOnGround = true;
|
||||||
}
|
}
|
||||||
@ -1095,9 +1095,9 @@ void cEntity::HandleAir(void)
|
|||||||
|
|
||||||
if (IsSubmerged())
|
if (IsSubmerged())
|
||||||
{
|
{
|
||||||
if (!IsPlayer()) // Players control themselves
|
if (!IsPlayer()) // Players control themselves
|
||||||
{
|
{
|
||||||
SetSpeedY(1); // Float in the water
|
SetSpeedY(1); // Float in the water
|
||||||
}
|
}
|
||||||
|
|
||||||
// Either reduce air level or damage player
|
// Either reduce air level or damage player
|
||||||
@ -1266,9 +1266,9 @@ void cEntity::BroadcastMovementUpdate(const cClientHandle * a_Exclude)
|
|||||||
int DiffY = (int)(floor(GetPosY() * 32.0) - floor(m_LastPos.y * 32.0));
|
int DiffY = (int)(floor(GetPosY() * 32.0) - floor(m_LastPos.y * 32.0));
|
||||||
int DiffZ = (int)(floor(GetPosZ() * 32.0) - floor(m_LastPos.z * 32.0));
|
int DiffZ = (int)(floor(GetPosZ() * 32.0) - floor(m_LastPos.z * 32.0));
|
||||||
|
|
||||||
if ((DiffX != 0) || (DiffY != 0) || (DiffZ != 0)) // Have we moved?
|
if ((DiffX != 0) || (DiffY != 0) || (DiffZ != 0)) // Have we moved?
|
||||||
{
|
{
|
||||||
if ((abs(DiffX) <= 127) && (abs(DiffY) <= 127) && (abs(DiffZ) <= 127)) // Limitations of a Byte
|
if ((abs(DiffX) <= 127) && (abs(DiffY) <= 127) && (abs(DiffZ) <= 127)) // Limitations of a Byte
|
||||||
{
|
{
|
||||||
// Difference within Byte limitations, use a relative move packet
|
// Difference within Byte limitations, use a relative move packet
|
||||||
if (m_bDirtyOrientation)
|
if (m_bDirtyOrientation)
|
||||||
@ -1288,7 +1288,7 @@ void cEntity::BroadcastMovementUpdate(const cClientHandle * a_Exclude)
|
|||||||
{
|
{
|
||||||
// Too big a movement, do a teleport
|
// Too big a movement, do a teleport
|
||||||
m_World->BroadcastTeleportEntity(*this, a_Exclude);
|
m_World->BroadcastTeleportEntity(*this, a_Exclude);
|
||||||
m_LastPos = GetPosition(); // See above
|
m_LastPos = GetPosition(); // See above
|
||||||
m_bDirtyOrientation = false;
|
m_bDirtyOrientation = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -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)
|
||||||
{
|
{
|
||||||
|
@ -506,7 +506,7 @@ protected:
|
|||||||
overrides can provide further processing, such as forcing players to move at the given speed. */
|
overrides can provide further processing, such as forcing players to move at the given speed. */
|
||||||
virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ);
|
virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ);
|
||||||
|
|
||||||
virtual void Destroyed(void) {} // Called after the entity has been destroyed
|
virtual void Destroyed(void) {} // Called after the entity has been destroyed
|
||||||
|
|
||||||
/** Called in each tick to handle air-related processing i.e. drowning */
|
/** Called in each tick to handle air-related processing i.e. drowning */
|
||||||
virtual void HandleAir(void);
|
virtual void HandleAir(void);
|
||||||
|
@ -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)
|
||||||
|
@ -30,4 +30,4 @@ protected:
|
|||||||
// cProjectileEntity overrides:
|
// cProjectileEntity overrides:
|
||||||
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
||||||
|
|
||||||
}; // tolua_export
|
}; // tolua_export
|
||||||
|
@ -33,4 +33,4 @@ protected:
|
|||||||
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
||||||
virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
|
virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
|
||||||
|
|
||||||
} ; // tolua_export
|
} ; // tolua_export
|
||||||
|
@ -37,4 +37,4 @@ private:
|
|||||||
int m_ExplodeTimer;
|
int m_ExplodeTimer;
|
||||||
cItem m_FireworkItem;
|
cItem m_FireworkItem;
|
||||||
|
|
||||||
}; // tolua_export
|
}; // tolua_export
|
||||||
|
@ -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
|
||||||
@ -130,7 +130,7 @@ void cFloater::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
HandlePhysics(a_Dt, a_Chunk);
|
HandlePhysics(a_Dt, a_Chunk);
|
||||||
if (IsBlockWater(m_World->GetBlock((int) GetPosX(), (int) GetPosY(), (int) GetPosZ())) && m_World->GetBlockMeta((int) GetPosX(), (int) GetPosY(), (int) GetPosZ()) == 0)
|
if (IsBlockWater(m_World->GetBlock((int) GetPosX(), (int) GetPosY(), (int) GetPosZ())) && m_World->GetBlockMeta((int) GetPosX(), (int) GetPosY(), (int) GetPosZ()) == 0)
|
||||||
{
|
{
|
||||||
if ((!m_CanPickupItem) && (m_AttachedMobID == -1)) // Check if you can't already pickup a fish and if the floater isn't attached to a mob.
|
if ((!m_CanPickupItem) && (m_AttachedMobID == -1)) // Check if you can't already pickup a fish and if the floater isn't attached to a mob.
|
||||||
{
|
{
|
||||||
if (m_CountDownTime <= 0)
|
if (m_CountDownTime <= 0)
|
||||||
{
|
{
|
||||||
@ -141,7 +141,7 @@ void cFloater::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
m_CountDownTime = 100 + m_World->GetTickRandomNumber(800);
|
m_CountDownTime = 100 + m_World->GetTickRandomNumber(800);
|
||||||
LOGD("Floater %i can be picked up", GetUniqueID());
|
LOGD("Floater %i can be picked up", GetUniqueID());
|
||||||
}
|
}
|
||||||
else if (m_CountDownTime == 20) // Calculate the position where the particles should spawn and start producing them.
|
else if (m_CountDownTime == 20) // Calculate the position where the particles should spawn and start producing them.
|
||||||
{
|
{
|
||||||
LOGD("Started producing particles for floater %i", GetUniqueID());
|
LOGD("Started producing particles for floater %i", GetUniqueID());
|
||||||
m_ParticlePos.Set(GetPosX() + (-4 + m_World->GetTickRandomNumber(8)), GetPosY(), GetPosZ() + (-4 + m_World->GetTickRandomNumber(8)));
|
m_ParticlePos.Set(GetPosX() + (-4 + m_World->GetTickRandomNumber(8)), GetPosY(), GetPosZ() + (-4 + m_World->GetTickRandomNumber(8)));
|
||||||
@ -156,12 +156,12 @@ void cFloater::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
m_CountDownTime--;
|
m_CountDownTime--;
|
||||||
if (m_World->GetHeight((int) GetPosX(), (int) GetPosZ()) == (int) GetPosY())
|
if (m_World->GetHeight((int) GetPosX(), (int) GetPosZ()) == (int) GetPosY())
|
||||||
{
|
{
|
||||||
if (m_World->IsWeatherWet() && m_World->GetTickRandomNumber(3) == 0) // 25% chance of an extra countdown when being rained on.
|
if (m_World->IsWeatherWet() && m_World->GetTickRandomNumber(3) == 0) // 25% chance of an extra countdown when being rained on.
|
||||||
{
|
{
|
||||||
m_CountDownTime--;
|
m_CountDownTime--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // if the floater is underground it has a 50% chance of not decreasing the countdown.
|
else // if the floater is underground it has a 50% chance of not decreasing the countdown.
|
||||||
{
|
{
|
||||||
if (m_World->GetTickRandomNumber(1) == 0)
|
if (m_World->GetTickRandomNumber(1) == 0)
|
||||||
{
|
{
|
||||||
@ -190,21 +190,21 @@ void cFloater::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
if (Callback.HasHit())
|
if (Callback.HasHit())
|
||||||
{
|
{
|
||||||
AttachTo(Callback.GetHitEntity());
|
AttachTo(Callback.GetHitEntity());
|
||||||
Callback.GetHitEntity()->TakeDamage(*this); // TODO: the player attacked the mob not the floater.
|
Callback.GetHitEntity()->TakeDamage(*this); // TODO: the player attacked the mob not the floater.
|
||||||
m_AttachedMobID = Callback.GetHitEntity()->GetUniqueID();
|
m_AttachedMobID = Callback.GetHitEntity()->GetUniqueID();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cFloaterCheckEntityExist EntityCallback;
|
cFloaterCheckEntityExist EntityCallback;
|
||||||
m_World->DoWithEntityByID(m_PlayerID, EntityCallback);
|
m_World->DoWithEntityByID(m_PlayerID, EntityCallback);
|
||||||
if (!EntityCallback.DoesExist()) // The owner doesn't exist anymore. Destroy the floater entity.
|
if (!EntityCallback.DoesExist()) // The owner doesn't exist anymore. Destroy the floater entity.
|
||||||
{
|
{
|
||||||
Destroy(true);
|
Destroy(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_AttachedMobID != -1)
|
if (m_AttachedMobID != -1)
|
||||||
{
|
{
|
||||||
m_World->DoWithEntityByID(m_AttachedMobID, EntityCallback); // The mob the floater was attached to doesn't exist anymore.
|
m_World->DoWithEntityByID(m_AttachedMobID, EntityCallback); // The mob the floater was attached to doesn't exist anymore.
|
||||||
if (!EntityCallback.DoesExist())
|
if (!EntityCallback.DoesExist())
|
||||||
{
|
{
|
||||||
m_AttachedMobID = -1;
|
m_AttachedMobID = -1;
|
||||||
|
@ -14,7 +14,7 @@ class cFloater :
|
|||||||
typedef cEntity super;
|
typedef cEntity super;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
//tolua_end
|
// tolua_end
|
||||||
|
|
||||||
CLASS_PROTODEF(cFloater);
|
CLASS_PROTODEF(cFloater);
|
||||||
|
|
||||||
@ -43,4 +43,4 @@ protected:
|
|||||||
// Entity IDs
|
// Entity IDs
|
||||||
int m_PlayerID;
|
int m_PlayerID;
|
||||||
int m_AttachedMobID;
|
int m_AttachedMobID;
|
||||||
} ; // tolua_export
|
} ; // tolua_export
|
||||||
|
@ -35,4 +35,4 @@ protected:
|
|||||||
|
|
||||||
// TODO: Deflecting the fireballs by arrow- or sword- hits
|
// TODO: Deflecting the fireballs by arrow- or sword- hits
|
||||||
|
|
||||||
} ; // tolua_export
|
} ; // tolua_export
|
||||||
|
@ -28,14 +28,14 @@ void cHangingEntity::SpawnOn(cClientHandle & a_ClientHandle)
|
|||||||
// The client uses different values for item frame directions and block faces. Our constants are for the block faces, so we convert them here to item frame faces
|
// The client uses different values for item frame directions and block faces. Our constants are for the block faces, so we convert them here to item frame faces
|
||||||
switch (m_BlockFace)
|
switch (m_BlockFace)
|
||||||
{
|
{
|
||||||
case BLOCK_FACE_ZP: break; // Initialised to zero
|
case BLOCK_FACE_ZP: break; // Initialised to zero
|
||||||
case BLOCK_FACE_ZM: Dir = 2; break;
|
case BLOCK_FACE_ZM: Dir = 2; break;
|
||||||
case BLOCK_FACE_XM: Dir = 1; break;
|
case BLOCK_FACE_XM: Dir = 1; break;
|
||||||
case BLOCK_FACE_XP: Dir = 3; break;
|
case BLOCK_FACE_XP: Dir = 3; break;
|
||||||
default: ASSERT(!"Unhandled block face when trying to spawn item frame!"); return;
|
default: ASSERT(!"Unhandled block face when trying to spawn item frame!"); return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((Dir == 0) || (Dir == 2)) // Probably a client bug, but two directions are flipped and contrary to the norm, so we do -180
|
if ((Dir == 0) || (Dir == 2)) // Probably a client bug, but two directions are flipped and contrary to the norm, so we do -180
|
||||||
{
|
{
|
||||||
SetYaw((Dir * 90) - 180);
|
SetYaw((Dir * 90) - 180);
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ void cItemFrame::OnRightClicked(cPlayer & a_Player)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GetWorld()->BroadcastEntityMetadata(*this); // Update clients
|
GetWorld()->BroadcastEntityMetadata(*this); // Update clients
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -117,7 +117,7 @@ void cMinecart::SpawnOn(cClientHandle & a_ClientHandle)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
a_ClientHandle.SendSpawnVehicle(*this, 10, SubType); // 10 = Minecarts, SubType = What type of Minecart
|
a_ClientHandle.SendSpawnVehicle(*this, 10, SubType); // 10 = Minecarts, SubType = What type of Minecart
|
||||||
a_ClientHandle.SendEntityMetadata(*this);
|
a_ClientHandle.SendEntityMetadata(*this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -127,7 +127,7 @@ void cMinecart::SpawnOn(cClientHandle & a_ClientHandle)
|
|||||||
|
|
||||||
void cMinecart::HandlePhysics(float a_Dt, cChunk & a_Chunk)
|
void cMinecart::HandlePhysics(float a_Dt, cChunk & a_Chunk)
|
||||||
{
|
{
|
||||||
if (IsDestroyed()) // Mainly to stop detector rails triggering again after minecart is dead
|
if (IsDestroyed()) // Mainly to stop detector rails triggering again after minecart is dead
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -156,8 +156,8 @@ void cMinecart::HandlePhysics(float a_Dt, cChunk & a_Chunk)
|
|||||||
|
|
||||||
if (!IsBlockRail(InsideType))
|
if (!IsBlockRail(InsideType))
|
||||||
{
|
{
|
||||||
Chunk->GetBlockTypeMeta(RelPosX, PosY + 1, RelPosZ, InsideType, InsideMeta); // When an descending minecart hits a flat rail, it goes through the ground; check for this
|
Chunk->GetBlockTypeMeta(RelPosX, PosY + 1, RelPosZ, InsideType, InsideMeta); // When an descending minecart hits a flat rail, it goes through the ground; check for this
|
||||||
if (IsBlockRail(InsideType)) AddPosY(1); // Push cart upwards
|
if (IsBlockRail(InsideType)) AddPosY(1); // Push cart upwards
|
||||||
}
|
}
|
||||||
|
|
||||||
bool WasDetectorRail = false;
|
bool WasDetectorRail = false;
|
||||||
@ -186,12 +186,12 @@ void cMinecart::HandlePhysics(float a_Dt, cChunk & a_Chunk)
|
|||||||
default: VERIFY(!"Unhandled rail type despite checking if block was rail!"); break;
|
default: VERIFY(!"Unhandled rail type despite checking if block was rail!"); break;
|
||||||
}
|
}
|
||||||
|
|
||||||
AddPosition(GetSpeed() * (a_Dt / 1000)); // Commit changes; as we use our own engine when on rails, this needs to be done, whereas it is normally in Entity.cpp
|
AddPosition(GetSpeed() * (a_Dt / 1000)); // Commit changes; as we use our own engine when on rails, this needs to be done, whereas it is normally in Entity.cpp
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Not on rail, default physics
|
// Not on rail, default physics
|
||||||
SetPosY(floor(GetPosY()) + 0.35); // HandlePhysics overrides this if minecart can fall, else, it is to stop ground clipping minecart bottom when off-rail
|
SetPosY(floor(GetPosY()) + 0.35); // HandlePhysics overrides this if minecart can fall, else, it is to stop ground clipping minecart bottom when off-rail
|
||||||
super::HandlePhysics(a_Dt, *Chunk);
|
super::HandlePhysics(a_Dt, *Chunk);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -223,18 +223,18 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
|
|||||||
|
|
||||||
switch (a_RailMeta)
|
switch (a_RailMeta)
|
||||||
{
|
{
|
||||||
case E_META_RAIL_ZM_ZP: // NORTHSOUTH
|
case E_META_RAIL_ZM_ZP: // NORTHSOUTH
|
||||||
{
|
{
|
||||||
SetYaw(270);
|
SetYaw(270);
|
||||||
SetPosY(floor(GetPosY()) + 0.55);
|
SetPosY(floor(GetPosY()) + 0.55);
|
||||||
SetSpeedY(0); // Don't move vertically as on ground
|
SetSpeedY(0); // Don't move vertically as on ground
|
||||||
SetSpeedX(0); // Correct diagonal movement from curved rails
|
SetSpeedX(0); // Correct diagonal movement from curved rails
|
||||||
|
|
||||||
// Execute both the entity and block collision checks
|
// Execute both the entity and block collision checks
|
||||||
bool BlckCol = TestBlockCollision(a_RailMeta), EntCol = TestEntityCollision(a_RailMeta);
|
bool BlckCol = TestBlockCollision(a_RailMeta), EntCol = TestEntityCollision(a_RailMeta);
|
||||||
if (EntCol || BlckCol) return;
|
if (EntCol || BlckCol) return;
|
||||||
|
|
||||||
if (GetSpeedZ() != 0) // Don't do anything if cart is stationary
|
if (GetSpeedZ() != 0) // Don't do anything if cart is stationary
|
||||||
{
|
{
|
||||||
if (GetSpeedZ() > 0)
|
if (GetSpeedZ() > 0)
|
||||||
{
|
{
|
||||||
@ -249,7 +249,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_XM_XP: // EASTWEST
|
case E_META_RAIL_XM_XP: // EASTWEST
|
||||||
{
|
{
|
||||||
SetYaw(180);
|
SetYaw(180);
|
||||||
SetPosY(floor(GetPosY()) + 0.55);
|
SetPosY(floor(GetPosY()) + 0.55);
|
||||||
@ -272,7 +272,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_ASCEND_ZM: // ASCEND NORTH
|
case E_META_RAIL_ASCEND_ZM: // ASCEND NORTH
|
||||||
{
|
{
|
||||||
SetYaw(270);
|
SetYaw(270);
|
||||||
SetSpeedX(0);
|
SetSpeedX(0);
|
||||||
@ -280,21 +280,21 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
|
|||||||
if (GetSpeedZ() >= 0)
|
if (GetSpeedZ() >= 0)
|
||||||
{
|
{
|
||||||
// SpeedZ POSITIVE, going SOUTH
|
// SpeedZ POSITIVE, going SOUTH
|
||||||
if (GetSpeedZ() <= MAX_SPEED) // Speed limit
|
if (GetSpeedZ() <= MAX_SPEED) // Speed limit
|
||||||
{
|
{
|
||||||
AddSpeedZ(0.5); // Speed up
|
AddSpeedZ(0.5); // Speed up
|
||||||
SetSpeedY(-GetSpeedZ()); // Downward movement is negative (0 minus positive numbers is negative)
|
SetSpeedY(-GetSpeedZ()); // Downward movement is negative (0 minus positive numbers is negative)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// SpeedZ NEGATIVE, going NORTH
|
// SpeedZ NEGATIVE, going NORTH
|
||||||
AddSpeedZ(1); // Slow down
|
AddSpeedZ(1); // Slow down
|
||||||
SetSpeedY(-GetSpeedZ()); // Upward movement is positive (0 minus negative number is positive number)
|
SetSpeedY(-GetSpeedZ()); // Upward movement is positive (0 minus negative number is positive number)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_ASCEND_ZP: // ASCEND SOUTH
|
case E_META_RAIL_ASCEND_ZP: // ASCEND SOUTH
|
||||||
{
|
{
|
||||||
SetYaw(270);
|
SetYaw(270);
|
||||||
SetSpeedX(0);
|
SetSpeedX(0);
|
||||||
@ -302,21 +302,21 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
|
|||||||
if (GetSpeedZ() > 0)
|
if (GetSpeedZ() > 0)
|
||||||
{
|
{
|
||||||
// SpeedZ POSITIVE, going SOUTH
|
// SpeedZ POSITIVE, going SOUTH
|
||||||
AddSpeedZ(-1); // Slow down
|
AddSpeedZ(-1); // Slow down
|
||||||
SetSpeedY(GetSpeedZ()); // Upward movement positive
|
SetSpeedY(GetSpeedZ()); // Upward movement positive
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (GetSpeedZ() >= MAX_SPEED_NEGATIVE) // Speed limit
|
if (GetSpeedZ() >= MAX_SPEED_NEGATIVE) // Speed limit
|
||||||
{
|
{
|
||||||
// SpeedZ NEGATIVE, going NORTH
|
// SpeedZ NEGATIVE, going NORTH
|
||||||
AddSpeedZ(-0.5); // Speed up
|
AddSpeedZ(-0.5); // Speed up
|
||||||
SetSpeedY(GetSpeedZ()); // Downward movement negative
|
SetSpeedY(GetSpeedZ()); // Downward movement negative
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_ASCEND_XM: // ASCEND EAST
|
case E_META_RAIL_ASCEND_XM: // ASCEND EAST
|
||||||
{
|
{
|
||||||
SetYaw(180);
|
SetYaw(180);
|
||||||
SetSpeedZ(0);
|
SetSpeedZ(0);
|
||||||
@ -336,7 +336,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_ASCEND_XP: // ASCEND WEST
|
case E_META_RAIL_ASCEND_XP: // ASCEND WEST
|
||||||
{
|
{
|
||||||
SetYaw(180);
|
SetYaw(180);
|
||||||
SetSpeedZ(0);
|
SetSpeedZ(0);
|
||||||
@ -356,10 +356,10 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_CURVED_ZM_XM: // Ends pointing NORTH and WEST
|
case E_META_RAIL_CURVED_ZM_XM: // Ends pointing NORTH and WEST
|
||||||
{
|
{
|
||||||
SetYaw(315); // Set correct rotation server side
|
SetYaw(315); // Set correct rotation server side
|
||||||
SetPosY(floor(GetPosY()) + 0.55); // Levitate dat cart
|
SetPosY(floor(GetPosY()) + 0.55); // Levitate dat cart
|
||||||
SetSpeedY(0);
|
SetSpeedY(0);
|
||||||
|
|
||||||
TestBlockCollision(a_RailMeta);
|
TestBlockCollision(a_RailMeta);
|
||||||
@ -369,7 +369,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_CURVED_ZM_XP: // Curved NORTH EAST
|
case E_META_RAIL_CURVED_ZM_XP: // Curved NORTH EAST
|
||||||
{
|
{
|
||||||
SetYaw(225);
|
SetYaw(225);
|
||||||
SetPosY(floor(GetPosY()) + 0.55);
|
SetPosY(floor(GetPosY()) + 0.55);
|
||||||
@ -380,7 +380,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_CURVED_ZP_XM: // Curved SOUTH WEST
|
case E_META_RAIL_CURVED_ZP_XM: // Curved SOUTH WEST
|
||||||
{
|
{
|
||||||
SetYaw(135);
|
SetYaw(135);
|
||||||
SetPosY(floor(GetPosY()) + 0.55);
|
SetPosY(floor(GetPosY()) + 0.55);
|
||||||
@ -391,7 +391,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_CURVED_ZP_XP: // Curved SOUTH EAST
|
case E_META_RAIL_CURVED_ZP_XP: // Curved SOUTH EAST
|
||||||
{
|
{
|
||||||
SetYaw(45);
|
SetYaw(45);
|
||||||
SetPosY(floor(GetPosY()) + 0.55);
|
SetPosY(floor(GetPosY()) + 0.55);
|
||||||
@ -404,7 +404,7 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
|
|||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
ASSERT(!"Unhandled rail meta!"); // Dun dun DUN!
|
ASSERT(!"Unhandled rail meta!"); // Dun dun DUN!
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -428,7 +428,7 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
|
|||||||
|
|
||||||
switch (a_RailMeta & 0x07)
|
switch (a_RailMeta & 0x07)
|
||||||
{
|
{
|
||||||
case E_META_RAIL_ZM_ZP: // NORTHSOUTH
|
case E_META_RAIL_ZM_ZP: // NORTHSOUTH
|
||||||
{
|
{
|
||||||
SetYaw(270);
|
SetYaw(270);
|
||||||
SetPosY(floor(GetPosY()) + 0.55);
|
SetPosY(floor(GetPosY()) + 0.55);
|
||||||
@ -451,7 +451,7 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_XM_XP: // EASTWEST
|
case E_META_RAIL_XM_XP: // EASTWEST
|
||||||
{
|
{
|
||||||
SetYaw(180);
|
SetYaw(180);
|
||||||
SetPosY(floor(GetPosY()) + 0.55);
|
SetPosY(floor(GetPosY()) + 0.55);
|
||||||
@ -474,7 +474,7 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_ASCEND_XM: // ASCEND EAST
|
case E_META_RAIL_ASCEND_XM: // ASCEND EAST
|
||||||
{
|
{
|
||||||
SetYaw(180);
|
SetYaw(180);
|
||||||
SetSpeedZ(0);
|
SetSpeedZ(0);
|
||||||
@ -494,7 +494,7 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_ASCEND_XP: // ASCEND WEST
|
case E_META_RAIL_ASCEND_XP: // ASCEND WEST
|
||||||
{
|
{
|
||||||
SetYaw(180);
|
SetYaw(180);
|
||||||
SetSpeedZ(0);
|
SetSpeedZ(0);
|
||||||
@ -514,7 +514,7 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_ASCEND_ZM: // ASCEND NORTH
|
case E_META_RAIL_ASCEND_ZM: // ASCEND NORTH
|
||||||
{
|
{
|
||||||
SetYaw(270);
|
SetYaw(270);
|
||||||
SetSpeedX(0);
|
SetSpeedX(0);
|
||||||
@ -534,7 +534,7 @@ void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case E_META_RAIL_ASCEND_ZP: // ASCEND SOUTH
|
case E_META_RAIL_ASCEND_ZP: // ASCEND SOUTH
|
||||||
{
|
{
|
||||||
SetYaw(270);
|
SetYaw(270);
|
||||||
SetSpeedX(0);
|
SetSpeedX(0);
|
||||||
@ -907,7 +907,7 @@ bool cMinecart::DoTakeDamage(TakeDamageInfo & TDI)
|
|||||||
if ((TDI.Attacker != NULL) && TDI.Attacker->IsPlayer() && ((cPlayer *)TDI.Attacker)->IsGameModeCreative())
|
if ((TDI.Attacker != NULL) && TDI.Attacker->IsPlayer() && ((cPlayer *)TDI.Attacker)->IsGameModeCreative())
|
||||||
{
|
{
|
||||||
Destroy();
|
Destroy();
|
||||||
TDI.FinalDamage = GetMaxHealth(); // Instant hit for creative
|
TDI.FinalDamage = GetMaxHealth(); // Instant hit for creative
|
||||||
SetInvulnerableTicks(0);
|
SetInvulnerableTicks(0);
|
||||||
return super::DoTakeDamage(TDI); // No drops for creative
|
return super::DoTakeDamage(TDI); // No drops for creative
|
||||||
}
|
}
|
||||||
@ -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) :
|
||||||
@ -1078,12 +1078,12 @@ void cMinecartWithFurnace::OnRightClicked(cPlayer & a_Player)
|
|||||||
{
|
{
|
||||||
a_Player.GetInventory().RemoveOneEquippedItem();
|
a_Player.GetInventory().RemoveOneEquippedItem();
|
||||||
}
|
}
|
||||||
if (!m_IsFueled) // We don't want to change the direction by right clicking it.
|
if (!m_IsFueled) // We don't want to change the direction by right clicking it.
|
||||||
{
|
{
|
||||||
AddSpeed(a_Player.GetLookVector().x, 0, a_Player.GetLookVector().z);
|
AddSpeed(a_Player.GetLookVector().x, 0, a_Player.GetLookVector().z);
|
||||||
}
|
}
|
||||||
m_IsFueled = true;
|
m_IsFueled = true;
|
||||||
m_FueledTimeLeft = m_FueledTimeLeft + 600; // The minecart will be active 600 more ticks.
|
m_FueledTimeLeft = m_FueledTimeLeft + 600; // The minecart will be active 600 more ticks.
|
||||||
m_World->BroadcastEntityMetadata(*this);
|
m_World->BroadcastEntityMetadata(*this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -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) :
|
||||||
|
@ -18,8 +18,8 @@ public:
|
|||||||
CLASS_PROTODEF(cPainting);
|
CLASS_PROTODEF(cPainting);
|
||||||
|
|
||||||
cPainting(const AString & a_Name, int a_Direction, double a_X, double a_Y, double a_Z);
|
cPainting(const AString & a_Name, int a_Direction, double a_X, double a_Y, double a_Z);
|
||||||
const AString & GetName(void) const { return m_Name; } // tolua_export
|
const AString & GetName(void) const { return m_Name; } // tolua_export
|
||||||
int GetDirection(void) const { return m_Direction; } // tolua_export
|
int GetDirection(void) const { return m_Direction; } // tolua_export
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
|
||||||
@ -150,10 +150,10 @@ void cPickup::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!IsDestroyed() && (m_Item.m_ItemCount < m_Item.GetMaxStackSize())) // Don't combine into an already full pickup
|
if (!IsDestroyed() && (m_Item.m_ItemCount < m_Item.GetMaxStackSize())) // Don't combine into an already full pickup
|
||||||
{
|
{
|
||||||
cPickupCombiningCallback PickupCombiningCallback(GetPosition(), this);
|
cPickupCombiningCallback PickupCombiningCallback(GetPosition(), this);
|
||||||
m_World->ForEachEntity(PickupCombiningCallback); // Not ForEachEntityInChunk, otherwise pickups don't combine across chunk boundaries
|
m_World->ForEachEntity(PickupCombiningCallback); // Not ForEachEntityInChunk, otherwise pickups don't combine across chunk boundaries
|
||||||
if (PickupCombiningCallback.FoundMatchingPickup())
|
if (PickupCombiningCallback.FoundMatchingPickup())
|
||||||
{
|
{
|
||||||
m_World->BroadcastEntityMetadata(*this);
|
m_World->BroadcastEntityMetadata(*this);
|
||||||
@ -176,7 +176,7 @@ void cPickup::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GetPosY() < VOID_BOUNDARY) // Out of this world and no more visible!
|
if (GetPosY() < VOID_BOUNDARY) // Out of this world and no more visible!
|
||||||
{
|
{
|
||||||
Destroy(true);
|
Destroy(true);
|
||||||
return;
|
return;
|
||||||
@ -194,14 +194,14 @@ bool cPickup::CollectedBy(cPlayer * a_Dest)
|
|||||||
if (m_bCollected)
|
if (m_bCollected)
|
||||||
{
|
{
|
||||||
// LOG("Pickup %d cannot be collected by \"%s\", because it has already been collected.", m_UniqueID, a_Dest->GetName().c_str());
|
// LOG("Pickup %d cannot be collected by \"%s\", because it has already been collected.", m_UniqueID, a_Dest->GetName().c_str());
|
||||||
return false; // It's already collected!
|
return false; // It's already collected!
|
||||||
}
|
}
|
||||||
|
|
||||||
// Two seconds if player created the pickup (vomiting), half a second if anything else
|
// Two seconds if player created the pickup (vomiting), half a second if anything else
|
||||||
if (m_Timer < (m_bIsPlayerCreated ? 2000.f : 500.f))
|
if (m_Timer < (m_bIsPlayerCreated ? 2000.f : 500.f))
|
||||||
{
|
{
|
||||||
// LOG("Pickup %d cannot be collected by \"%s\", because it is not old enough.", m_UniqueID, a_Dest->GetName().c_str());
|
// LOG("Pickup %d cannot be collected by \"%s\", because it is not old enough.", m_UniqueID, a_Dest->GetName().c_str());
|
||||||
return false; // Not old enough
|
return false; // Not old enough
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cRoot::Get()->GetPluginManager()->CallHookCollectingPickup(a_Dest, *this))
|
if (cRoot::Get()->GetPluginManager()->CallHookCollectingPickup(a_Dest, *this))
|
||||||
|
@ -27,7 +27,7 @@ public:
|
|||||||
|
|
||||||
cPickup(double a_PosX, double a_PosY, double a_PosZ, const cItem & a_Item, bool IsPlayerCreated, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f);
|
cPickup(double a_PosX, double a_PosY, double a_PosZ, const cItem & a_Item, bool IsPlayerCreated, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f);
|
||||||
|
|
||||||
cItem & GetItem(void) {return m_Item; } // tolua_export
|
cItem & GetItem(void) {return m_Item; } // tolua_export
|
||||||
const cItem & GetItem(void) const {return m_Item; }
|
const cItem & GetItem(void) const {return m_Item; }
|
||||||
|
|
||||||
virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
|
virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
|
||||||
@ -46,7 +46,7 @@ public:
|
|||||||
bool IsCollected(void) const { return m_bCollected; } // tolua_export
|
bool IsCollected(void) const { return m_bCollected; } // tolua_export
|
||||||
|
|
||||||
/** Returns true if created by player (i.e. vomiting), used for determining picking-up delay time */
|
/** Returns true if created by player (i.e. vomiting), used for determining picking-up delay time */
|
||||||
bool IsPlayerCreated(void) const { return m_bIsPlayerCreated; } // tolua_export
|
bool IsPlayerCreated(void) const { return m_bIsPlayerCreated; } // tolua_export
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
@ -223,7 +223,7 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
SendExperience();
|
SendExperience();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!GetPosition().EqualsEps(m_LastPos, 0.01)) // Non negligible change in position from last tick?
|
if (!GetPosition().EqualsEps(m_LastPos, 0.01)) // Non negligible change in position from last tick?
|
||||||
{
|
{
|
||||||
// Apply food exhaustion from movement:
|
// Apply food exhaustion from movement:
|
||||||
ApplyFoodExhaustionFromMovement();
|
ApplyFoodExhaustionFromMovement();
|
||||||
@ -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;
|
||||||
@ -375,7 +375,7 @@ short cPlayer::DeltaExperience(short a_Xp_delta)
|
|||||||
// Value was bad, abort and report
|
// Value was bad, abort and report
|
||||||
LOGWARNING("Attempt was made to increment Xp by %d, which overflowed the short datatype. Ignoring.",
|
LOGWARNING("Attempt was made to increment Xp by %d, which overflowed the short datatype. Ignoring.",
|
||||||
a_Xp_delta);
|
a_Xp_delta);
|
||||||
return -1; // Should we instead just return the current Xp?
|
return -1; // Should we instead just return the current Xp?
|
||||||
}
|
}
|
||||||
|
|
||||||
m_CurrentXp += a_Xp_delta;
|
m_CurrentXp += a_Xp_delta;
|
||||||
@ -477,7 +477,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
|
|||||||
{
|
{
|
||||||
float Dist = (float)(m_LastGroundHeight - floor(GetPosY()));
|
float Dist = (float)(m_LastGroundHeight - floor(GetPosY()));
|
||||||
|
|
||||||
if (Dist >= 2.0) // At least two blocks - TODO: Use m_LastJumpHeight instead of m_LastGroundHeight above
|
if (Dist >= 2.0) // At least two blocks - TODO: Use m_LastJumpHeight instead of m_LastGroundHeight above
|
||||||
{
|
{
|
||||||
// Increment statistic
|
// Increment statistic
|
||||||
m_Stats.AddValue(statDistFallen, (StatValue)floor(Dist * 100 + 0.5));
|
m_Stats.AddValue(statDistFallen, (StatValue)floor(Dist * 100 + 0.5));
|
||||||
@ -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);
|
||||||
@ -871,10 +871,10 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI)
|
|||||||
|
|
||||||
if (m_Health > 0)
|
if (m_Health > 0)
|
||||||
{
|
{
|
||||||
return; // not dead yet =]
|
return; // not dead yet =]
|
||||||
}
|
}
|
||||||
|
|
||||||
m_bVisible = false; // So new clients don't see the player
|
m_bVisible = false; // So new clients don't see the player
|
||||||
|
|
||||||
// Puke out all the items
|
// Puke out all the items
|
||||||
cItems Pickups;
|
cItems Pickups;
|
||||||
@ -925,7 +925,7 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
AString KillerClass = a_TDI.Attacker->GetClass();
|
AString KillerClass = a_TDI.Attacker->GetClass();
|
||||||
KillerClass.erase(KillerClass.begin()); // Erase the 'c' of the class (e.g. "cWitch" -> "Witch")
|
KillerClass.erase(KillerClass.begin()); // Erase the 'c' of the class (e.g. "cWitch" -> "Witch")
|
||||||
|
|
||||||
GetWorld()->BroadcastChatDeath(Printf("%s was killed by a %s", GetName().c_str(), KillerClass.c_str()));
|
GetWorld()->BroadcastChatDeath(Printf("%s was killed by a %s", GetName().c_str(), KillerClass.c_str()));
|
||||||
}
|
}
|
||||||
@ -1338,7 +1338,7 @@ void cPlayer::MoveTo( const Vector3d & a_NewPos )
|
|||||||
|
|
||||||
void cPlayer::SetVisible(bool a_bVisible)
|
void cPlayer::SetVisible(bool a_bVisible)
|
||||||
{
|
{
|
||||||
if (a_bVisible && !m_bVisible) // Make visible
|
if (a_bVisible && !m_bVisible) // Make visible
|
||||||
{
|
{
|
||||||
m_bVisible = true;
|
m_bVisible = true;
|
||||||
m_World->BroadcastSpawnEntity(*this);
|
m_World->BroadcastSpawnEntity(*this);
|
||||||
@ -1420,7 +1420,7 @@ bool cPlayer::HasPermission(const AString & a_Permission)
|
|||||||
{
|
{
|
||||||
if( OtherSplit[i].compare( Split[i] ) != 0 )
|
if( OtherSplit[i].compare( Split[i] ) != 0 )
|
||||||
{
|
{
|
||||||
if( OtherSplit[i].compare("*") == 0 ) return true; // WildCard man!! WildCard!
|
if( OtherSplit[i].compare("*") == 0 ) return true; // WildCard man!! WildCard!
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1548,7 +1548,7 @@ void cPlayer::TossEquippedItem(char a_Amount)
|
|||||||
char NewAmount = a_Amount;
|
char NewAmount = a_Amount;
|
||||||
if (NewAmount > GetInventory().GetEquippedItem().m_ItemCount)
|
if (NewAmount > GetInventory().GetEquippedItem().m_ItemCount)
|
||||||
{
|
{
|
||||||
NewAmount = GetInventory().GetEquippedItem().m_ItemCount; // Drop only what's there
|
NewAmount = GetInventory().GetEquippedItem().m_ItemCount; // Drop only what's there
|
||||||
}
|
}
|
||||||
|
|
||||||
GetInventory().GetHotbarGrid().ChangeSlotCount(GetInventory().GetEquippedSlotNum() /* Returns hotbar subslot, which HotbarGrid takes */, -a_Amount);
|
GetInventory().GetHotbarGrid().ChangeSlotCount(GetInventory().GetEquippedSlotNum() /* Returns hotbar subslot, which HotbarGrid takes */, -a_Amount);
|
||||||
@ -1610,7 +1610,7 @@ void cPlayer::TossItems(const cItems & a_Items)
|
|||||||
double vX = 0, vY = 0, vZ = 0;
|
double vX = 0, vY = 0, vZ = 0;
|
||||||
EulerToVector(-GetYaw(), GetPitch(), vZ, vX, vY);
|
EulerToVector(-GetYaw(), GetPitch(), vZ, vX, vY);
|
||||||
vY = -vY * 2 + 1.f;
|
vY = -vY * 2 + 1.f;
|
||||||
m_World->SpawnItemPickups(a_Items, GetPosX(), GetEyeHeight(), GetPosZ(), vX * 3, vY * 3, vZ * 3, true); // 'true' because created by player
|
m_World->SpawnItemPickups(a_Items, GetPosX(), GetEyeHeight(), GetPosZ(), vX * 3, vY * 3, vZ * 3, true); // 'true' because created by player
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -1931,7 +1931,7 @@ cPlayer::StringList cPlayer::GetResolvedPermissions()
|
|||||||
|
|
||||||
void cPlayer::UseEquippedItem(void)
|
void cPlayer::UseEquippedItem(void)
|
||||||
{
|
{
|
||||||
if (IsGameModeCreative()) // No damage in creative
|
if (IsGameModeCreative()) // No damage in creative
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -2074,7 +2074,7 @@ void cPlayer::UpdateMovementStats(const Vector3d & a_DeltaPos)
|
|||||||
{
|
{
|
||||||
if (IsClimbing())
|
if (IsClimbing())
|
||||||
{
|
{
|
||||||
if (a_DeltaPos.y > 0.0) // Going up
|
if (a_DeltaPos.y > 0.0) // Going up
|
||||||
{
|
{
|
||||||
m_Stats.AddValue(statDistClimbed, (StatValue)floor(a_DeltaPos.y * 100 + 0.5));
|
m_Stats.AddValue(statDistClimbed, (StatValue)floor(a_DeltaPos.y * 100 + 0.5));
|
||||||
}
|
}
|
||||||
@ -2093,7 +2093,7 @@ void cPlayer::UpdateMovementStats(const Vector3d & a_DeltaPos)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (Value >= 25) // Ignore small/slow movement
|
if (Value >= 25) // Ignore small/slow movement
|
||||||
{
|
{
|
||||||
m_Stats.AddValue(statDistFlown, Value);
|
m_Stats.AddValue(statDistFlown, Value);
|
||||||
}
|
}
|
||||||
|
@ -174,7 +174,7 @@ public:
|
|||||||
AString GetIP(void) const { return m_IP; } // tolua_export
|
AString GetIP(void) const { return m_IP; } // tolua_export
|
||||||
|
|
||||||
/** Returns the associated team, NULL if none */
|
/** Returns the associated team, NULL if none */
|
||||||
cTeam * GetTeam(void) { return m_Team; } // tolua_export
|
cTeam * GetTeam(void) { return m_Team; } // tolua_export
|
||||||
|
|
||||||
/** Sets the player team, NULL if none */
|
/** Sets the player team, NULL if none */
|
||||||
void SetTeam(cTeam * a_Team);
|
void SetTeam(cTeam * a_Team);
|
||||||
@ -200,7 +200,7 @@ public:
|
|||||||
|
|
||||||
/** Forces the player to move in the given direction.
|
/** Forces the player to move in the given direction.
|
||||||
@deprecated Use SetSpeed instead. */
|
@deprecated Use SetSpeed instead. */
|
||||||
void ForceSetSpeed(const Vector3d & a_Speed); // tolua_export
|
void ForceSetSpeed(const Vector3d & a_Speed); // tolua_export
|
||||||
|
|
||||||
/** Tries to move to a new position, with attachment-related checks (y == -999) */
|
/** Tries to move to a new position, with attachment-related checks (y == -999) */
|
||||||
void MoveTo(const Vector3d & a_NewPos); // tolua_export
|
void MoveTo(const Vector3d & a_NewPos); // tolua_export
|
||||||
@ -570,7 +570,7 @@ protected:
|
|||||||
/** Returns the filename for the player data based on the UUID given.
|
/** Returns the filename for the player data based on the UUID given.
|
||||||
This can be used both for online and offline UUIDs. */
|
This can be used both for online and offline UUIDs. */
|
||||||
AString GetUUIDFileName(const AString & a_UUID);
|
AString GetUUIDFileName(const AString & a_UUID);
|
||||||
} ; // tolua_export
|
} ; // tolua_export
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -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) :
|
||||||
|
@ -120,4 +120,4 @@ protected:
|
|||||||
virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
|
virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
|
||||||
virtual void SpawnOn(cClientHandle & a_Client) override;
|
virtual void SpawnOn(cClientHandle & a_Client) override;
|
||||||
|
|
||||||
} ; // tolua_export
|
} ; // tolua_export
|
||||||
|
@ -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(
|
||||||
|
@ -56,4 +56,4 @@ protected:
|
|||||||
/** Splashes the potion, fires its particle effects and sounds
|
/** Splashes the potion, fires its particle effects and sounds
|
||||||
@param a_HitPos The position where the potion will splash */
|
@param a_HitPos The position where the potion will splash */
|
||||||
void Splash(const Vector3d & a_HitPos);
|
void Splash(const Vector3d & a_HitPos);
|
||||||
} ; // tolua_export
|
} ; // tolua_export
|
||||||
|
@ -38,7 +38,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
int m_FuseTicks; ///< How much ticks is left, while the tnt will explode
|
int m_FuseTicks; ///< How much ticks is left, while the tnt will explode
|
||||||
}; // tolua_export
|
}; // tolua_export
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -55,4 +55,4 @@ private:
|
|||||||
/** Time in ticks to wait for the hit animation to begin before destroying */
|
/** Time in ticks to wait for the hit animation to begin before destroying */
|
||||||
int m_DestroyTimer;
|
int m_DestroyTimer;
|
||||||
|
|
||||||
} ; // tolua_export
|
} ; // tolua_export
|
||||||
|
@ -55,4 +55,4 @@ private:
|
|||||||
/** Time in ticks to wait for the hit animation to begin before destroying */
|
/** Time in ticks to wait for the hit animation to begin before destroying */
|
||||||
int m_DestroyTimer;
|
int m_DestroyTimer;
|
||||||
|
|
||||||
} ; // tolua_export
|
} ; // tolua_export
|
||||||
|
@ -52,4 +52,4 @@ private:
|
|||||||
/** Time in ticks to wait for the hit animation to begin before destroying */
|
/** Time in ticks to wait for the hit animation to begin before destroying */
|
||||||
int m_DestroyTimer;
|
int m_DestroyTimer;
|
||||||
|
|
||||||
} ; // tolua_export
|
} ; // tolua_export
|
||||||
|
@ -32,4 +32,4 @@ protected:
|
|||||||
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
||||||
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
|
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
|
||||||
|
|
||||||
} ; // tolua_export
|
} ; // tolua_export
|
||||||
|
@ -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) :
|
||||||
|
@ -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)
|
||||||
|
@ -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) :
|
||||||
|
@ -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) :
|
||||||
|
@ -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) :
|
||||||
|
@ -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.
|
||||||
|
@ -29,7 +29,7 @@ enum
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// cEndGen:
|
// cEndGen:
|
||||||
|
|
||||||
cEndGen::cEndGen(int a_Seed) :
|
cEndGen::cEndGen(int a_Seed) :
|
||||||
|
@ -40,12 +40,12 @@ static inline bool IsWater(BLOCKTYPE a_BlockType)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// cFinishGenNetherClumpFoliage:
|
// cFinishGenNetherClumpFoliage:
|
||||||
|
|
||||||
void cFinishGenNetherClumpFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
|
void cFinishGenNetherClumpFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
|
||||||
{
|
{
|
||||||
double ChunkX = a_ChunkDesc.GetChunkX() + 0.1; // We can't devide through 0 so lets add 0.1 to all the chunk coordinates.
|
double ChunkX = a_ChunkDesc.GetChunkX() + 0.1; // We can't devide through 0 so lets add 0.1 to all the chunk coordinates.
|
||||||
double ChunkZ = a_ChunkDesc.GetChunkZ() + 0.1;
|
double ChunkZ = a_ChunkDesc.GetChunkZ() + 0.1;
|
||||||
|
|
||||||
NOISE_DATATYPE Val1 = m_Noise.CubicNoise2D((float) (ChunkX * ChunkZ * 0.01f), (float) (ChunkZ / ChunkX * 0.01f));
|
NOISE_DATATYPE Val1 = m_Noise.CubicNoise2D((float) (ChunkX * ChunkZ * 0.01f), (float) (ChunkZ / ChunkX * 0.01f));
|
||||||
@ -125,7 +125,7 @@ void cFinishGenNetherClumpFoliage::TryPlaceClump(cChunkDesc & a_ChunkDesc, int a
|
|||||||
float zz = (float) a_ChunkDesc.GetChunkZ() * cChunkDef::Width + z;
|
float zz = (float) a_ChunkDesc.GetChunkZ() * cChunkDef::Width + z;
|
||||||
for (int y = a_RelY - 2; y < a_RelY + 2; y++)
|
for (int y = a_RelY - 2; y < a_RelY + 2; y++)
|
||||||
{
|
{
|
||||||
if (a_ChunkDesc.GetBlockType(x, y, z) != E_BLOCK_AIR) // Don't replace non air blocks.
|
if (a_ChunkDesc.GetBlockType(x, y, z) != E_BLOCK_AIR) // Don't replace non air blocks.
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -136,7 +136,7 @@ void cFinishGenNetherClumpFoliage::TryPlaceClump(cChunkDesc & a_ChunkDesc, int a
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsFireBlock) // don't place fire on non-forever burning blocks.
|
if (IsFireBlock) // don't place fire on non-forever burning blocks.
|
||||||
{
|
{
|
||||||
if (!cFireSimulator::DoesBurnForever(BlockBelow))
|
if (!cFireSimulator::DoesBurnForever(BlockBelow))
|
||||||
{
|
{
|
||||||
@ -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) :
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// cEmptyStructure:
|
// cEmptyStructure:
|
||||||
|
|
||||||
/** A cStructure descendant representing an empty structure.
|
/** A cStructure descendant representing an empty structure.
|
||||||
|
@ -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) :
|
||||||
@ -255,7 +255,7 @@ float cHeiGenClassic::GetNoise(float x, float y)
|
|||||||
|
|
||||||
float height = m_Noise.CubicNoise2D(x * 0.1f, y * 0.1f ) * 2;
|
float height = m_Noise.CubicNoise2D(x * 0.1f, y * 0.1f ) * 2;
|
||||||
|
|
||||||
float flatness = ((m_Noise.CubicNoise2D(x * 0.5f, y * 0.5f) + 1.f) * 0.5f) * 1.1f; // 0 ... 1.5
|
float flatness = ((m_Noise.CubicNoise2D(x * 0.5f, y * 0.5f) + 1.f) * 0.5f) * 1.1f; // 0 ... 1.5
|
||||||
flatness *= flatness * flatness;
|
flatness *= flatness * flatness;
|
||||||
|
|
||||||
return (oct1 + oct2 + oct3) * flatness + height;
|
return (oct1 + oct2 + oct3) * flatness + height;
|
||||||
@ -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] =
|
||||||
|
@ -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(
|
||||||
@ -732,7 +732,7 @@ void cMineShaftCorridor::ProcessChunk(cChunkDesc & a_ChunkDesc)
|
|||||||
|
|
||||||
PlaceChest(a_ChunkDesc);
|
PlaceChest(a_ChunkDesc);
|
||||||
PlaceTracks(a_ChunkDesc);
|
PlaceTracks(a_ChunkDesc);
|
||||||
PlaceSpawner(a_ChunkDesc); // (must be after Tracks!)
|
PlaceSpawner(a_ChunkDesc); // (must be after Tracks!)
|
||||||
PlaceTorches(a_ChunkDesc);
|
PlaceTorches(a_ChunkDesc);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -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(
|
||||||
|
@ -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);
|
||||||
|
@ -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) :
|
||||||
|
@ -150,7 +150,7 @@ static void DebugPieces(const cPlacedPieces & a_Pieces)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// cPOCPieceGenerator:
|
// cPOCPieceGenerator:
|
||||||
|
|
||||||
cPOCPieceGenerator::cPOCPieceGenerator(int a_Seed) :
|
cPOCPieceGenerator::cPOCPieceGenerator(int a_Seed) :
|
||||||
|
@ -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) :
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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:
|
||||||
|
|
||||||
|
|
||||||
|
@ -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,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) :
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user