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

Implemented droppers

Browse Source 
Added a common ancestor class "DropSpenser" that has the common code for dropper and dispenser and is Lua-accessible, too. The Debuggers plugin now triggers both droppers and dispensers when rclking them with a redstone torch.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1514 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2013-05-26 14:39:04 +00:00
parent b4522bf14e
commit 5c3235ecdc
29 changed files with 1130 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/Simulator/RedstoneSimulator.cpp
View File

@@ -425,32 +425,27 @@ void cRedstoneSimulator::HandleChange(const Vector3i & a_BlockPos)
} // switch (BlockType)
} // while (m_RefreshPistons[])
while (!m_RefreshDispensers.empty())
while (!m_RefreshDropSpensers.empty())
{
Vector3i pos = m_RefreshDispensers.back();
m_RefreshDispensers.pop_back();
Vector3i pos = m_RefreshDropSpensers.back();
m_RefreshDropSpensers.pop_back();
BLOCKTYPE BlockType = m_World.GetBlock(pos);
if (BlockType == E_BLOCK_DISPENSER)
if ((BlockType == E_BLOCK_DISPENSER) || (BlockType == E_BLOCK_DROPPER))
{
if (IsPowered(pos))
{
class cActivateDispenser :
public cDispenserCallback
class cActivateDropSpenser :
public cDropSpenserCallback
{
public:
cActivateDispenser()
virtual bool Item(cDropSpenserEntity * a_DropSpenser) override
{
}
virtual bool Item(cDispenserEntity * a_Dispenser) override
{
a_Dispenser->Activate();
a_DropSpenser->Activate();
return false;
}
} ;
cActivateDispenser DispAct;
m_World.DoWithDispenserAt(pos.x, pos.y, pos.z, DispAct);
cActivateDropSpenser DrSpAct;
m_World.DoWithDropSpenserAt(pos.x, pos.y, pos.z, DrSpAct);
}
}
}
@@ -485,8 +480,9 @@ bool cRedstoneSimulator::PowerBlock(const Vector3i & a_BlockPos, const Vector3i
}
case E_BLOCK_DISPENSER:
case E_BLOCK_DROPPER:
{
m_RefreshDispensers.push_back(a_BlockPos);
m_RefreshDropSpensers.push_back(a_BlockPos);
break;
}