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

Merge pull request #865 from wiseoldman95/patch-2

Browse Source 
Redstone simulator - cleaning up repeater lock code
This commit is contained in:
Alexander Harkness 2014-04-07 19:20:37 +01:00
commit 20a12beec3
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Simulator/IncrementalRedstoneSimulator.cpp
View File

@ -685,20 +685,20 @@ void cIncrementalRedstoneSimulator::HandleRedstoneRepeater(int a_BlockX, int a_B
{ {
// Create a variable holding my meta to avoid multiple lookups. // Create a variable holding my meta to avoid multiple lookups.
NIBBLETYPE a_Meta = m_World.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); NIBBLETYPE a_Meta = m_World.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
// Do the same for being on, self powered or locked.
bool IsOn = (a_MyState == E_BLOCK_REDSTONE_REPEATER_ON); bool IsOn = (a_MyState == E_BLOCK_REDSTONE_REPEATER_ON);
bool IsSelfPowered = IsRepeaterPowered(a_BlockX, a_BlockY, a_BlockZ, a_Meta);
bool IsLocked = IsRepeaterLocked(a_BlockX, a_BlockY, a_BlockZ, a_Meta);
if (IsSelfPowered && !IsOn && !IsLocked) // Queue a power change if powered, but not on and not locked. if (!IsRepeaterLocked(a_BlockX, a_BlockY, a_BlockZ, a_Meta)) // If we're locked, change nothing. Otherwise:
{
bool IsSelfPowered = IsRepeaterPowered(a_BlockX, a_BlockY, a_BlockZ, a_Meta);
if (IsSelfPowered && !IsOn) // Queue a power change if powered, but not on and not locked.
{ {
QueueRepeaterPowerChange(a_BlockX, a_BlockY, a_BlockZ, a_Meta, true); QueueRepeaterPowerChange(a_BlockX, a_BlockY, a_BlockZ, a_Meta, true);
} }
else if (!IsSelfPowered && IsOn && !IsLocked) // Queue a power change if unpowered, on, and not locked. else if (!IsSelfPowered && IsOn) // Queue a power change if unpowered, on, and not locked.
{ {
QueueRepeaterPowerChange(a_BlockX, a_BlockY, a_BlockZ, a_Meta, false); QueueRepeaterPowerChange(a_BlockX, a_BlockY, a_BlockZ, a_Meta, false);
} }
}
for (RepeatersDelayList::iterator itr = m_RepeatersDelayList->begin(); itr != m_RepeatersDelayList->end(); ++itr) for (RepeatersDelayList::iterator itr = m_RepeatersDelayList->begin(); itr != m_RepeatersDelayList->end(); ++itr)
{ {