Removed the cDoors class.
The helper functions that it implemented were moved into their respective blockhandlers.
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "BlockHandler.h"
|
||||
#include "../Doors.h"
|
||||
|
||||
|
||||
|
||||
@@ -26,7 +25,7 @@ public:
|
||||
) override
|
||||
{
|
||||
a_BlockType = m_BlockType;
|
||||
a_BlockMeta = cDoors::RotationToMetaData(a_Player->GetRotation() + 270);
|
||||
a_BlockMeta = PlayerYawToMetaData(a_Player->GetRotation());
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -34,7 +33,7 @@ public:
|
||||
virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
|
||||
{
|
||||
NIBBLETYPE OldMetaData = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
|
||||
NIBBLETYPE NewMetaData = cDoors::RotationToMetaData(a_Player->GetRotation() + 270);
|
||||
NIBBLETYPE NewMetaData = PlayerYawToMetaData(a_Player->GetRotation());
|
||||
OldMetaData ^= 4; // Toggle the gate
|
||||
if ((OldMetaData & 1) == (NewMetaData & 1))
|
||||
{
|
||||
@@ -53,6 +52,35 @@ public:
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/// Converts the player's yaw to placed gate's blockmeta
|
||||
inline static NIBBLETYPE PlayerYawToMetaData(double a_Yaw)
|
||||
{
|
||||
ASSERT((a_Yaw >= -180) && (a_Yaw < 180));
|
||||
|
||||
a_Yaw += 360 + 45;
|
||||
if (a_Yaw > 360)
|
||||
{
|
||||
a_Yaw -= 360;
|
||||
}
|
||||
if ((a_Yaw >= 0) && (a_Yaw < 90))
|
||||
{
|
||||
return 0x0;
|
||||
}
|
||||
else if ((a_Yaw >= 180) && (a_Yaw < 270))
|
||||
{
|
||||
return 0x2;
|
||||
}
|
||||
else if ((a_Yaw >= 90) && (a_Yaw < 180))
|
||||
{
|
||||
return 0x1;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0x3;
|
||||
}
|
||||
}
|
||||
} ;
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user