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

Revert "Replace ItemCallbacks with lambdas (#3948)"

Browse Source 
This reverts commit 496c337cdf.
This commit is contained in:
LogicParrot
2017-09-02 08:50:23 +01:00
committed by Alexander Harkness
parent 700bbdabf5
commit 49c443896d
67 changed files with 1832 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h
+23 -11
View File
@@ -27,37 +27,49 @@ public:
{
UNUSED(a_Meta);
unsigned int NumberOfEntities;
bool FoundPlayer;
a_World.ForEachEntityInBox(cBoundingBox(Vector3d(0.5, 0, 0.5) + a_Position, 0.5, 0.5), [&](cEntity & a_Entity)
class cPressurePlateCallback :
public cEntityCallback
{
public:
cPressurePlateCallback(void) :
m_NumberOfEntities(0),
m_FoundPlayer(false)
{
if (a_Entity.IsPlayer())
}
virtual bool Item(cEntity * a_Entity) override
{
if (a_Entity->IsPlayer())
{
FoundPlayer = true;
m_FoundPlayer = true;
}
NumberOfEntities++;
m_NumberOfEntities++;
return false;
}
);
unsigned int m_NumberOfEntities;
bool m_FoundPlayer;
} PressurePlateCallback;
a_World.ForEachEntityInBox(cBoundingBox(Vector3d(0.5, 0, 0.5) + a_Position, 0.5, 0.5), PressurePlateCallback);
switch (a_BlockType)
{
case E_BLOCK_STONE_PRESSURE_PLATE:
{
return (FoundPlayer ? 15 : 0);
return (PressurePlateCallback.m_FoundPlayer ? 15 : 0);
}
case E_BLOCK_WOODEN_PRESSURE_PLATE:
{
return (NumberOfEntities != 0 ? 15 : 0);
return (PressurePlateCallback.m_NumberOfEntities != 0 ? 15 : 0);
}
case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE:
{
return std::min(static_cast<unsigned char>(CeilC(NumberOfEntities / 10.f)), static_cast<unsigned char>(15));
return std::min(static_cast<unsigned char>(CeilC(PressurePlateCallback.m_NumberOfEntities / 10.f)), static_cast<unsigned char>(15));
}
case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE:
{
return std::min(static_cast<unsigned char>(NumberOfEntities), static_cast<unsigned char>(15));
return std::min(static_cast<unsigned char>(PressurePlateCallback.m_NumberOfEntities), static_cast<unsigned char>(15));
}
default:
{