Merge branch 'Sign'
This commit is contained in:
commit
749f073d70
@ -70,7 +70,7 @@
|
|||||||
#include "BlockSand.h"
|
#include "BlockSand.h"
|
||||||
#include "BlockSapling.h"
|
#include "BlockSapling.h"
|
||||||
#include "BlockSideways.h"
|
#include "BlockSideways.h"
|
||||||
#include "BlockSign.h"
|
#include "BlockSignPost.h"
|
||||||
#include "BlockSlab.h"
|
#include "BlockSlab.h"
|
||||||
#include "BlockSnow.h"
|
#include "BlockSnow.h"
|
||||||
#include "BlockStairs.h"
|
#include "BlockStairs.h"
|
||||||
@ -81,6 +81,7 @@
|
|||||||
#include "BlockTorch.h"
|
#include "BlockTorch.h"
|
||||||
#include "BlockTrapdoor.h"
|
#include "BlockTrapdoor.h"
|
||||||
#include "BlockVine.h"
|
#include "BlockVine.h"
|
||||||
|
#include "BlockWallSign.h"
|
||||||
#include "BlockWorkbench.h"
|
#include "BlockWorkbench.h"
|
||||||
|
|
||||||
|
|
||||||
@ -275,7 +276,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
|
|||||||
case E_BLOCK_SAND: return new cBlockSandHandler (a_BlockType);
|
case E_BLOCK_SAND: return new cBlockSandHandler (a_BlockType);
|
||||||
case E_BLOCK_SANDSTONE_STAIRS: return new cBlockStairsHandler (a_BlockType);
|
case E_BLOCK_SANDSTONE_STAIRS: return new cBlockStairsHandler (a_BlockType);
|
||||||
case E_BLOCK_SAPLING: return new cBlockSaplingHandler (a_BlockType);
|
case E_BLOCK_SAPLING: return new cBlockSaplingHandler (a_BlockType);
|
||||||
case E_BLOCK_SIGN_POST: return new cBlockSignHandler (a_BlockType);
|
case E_BLOCK_SIGN_POST: return new cBlockSignPostHandler (a_BlockType);
|
||||||
case E_BLOCK_SNOW: return new cBlockSnowHandler (a_BlockType);
|
case E_BLOCK_SNOW: return new cBlockSnowHandler (a_BlockType);
|
||||||
case E_BLOCK_SPRUCE_WOOD_STAIRS: return new cBlockStairsHandler (a_BlockType);
|
case E_BLOCK_SPRUCE_WOOD_STAIRS: return new cBlockStairsHandler (a_BlockType);
|
||||||
case E_BLOCK_STAINED_GLASS: return new cBlockGlassHandler (a_BlockType);
|
case E_BLOCK_STAINED_GLASS: return new cBlockGlassHandler (a_BlockType);
|
||||||
@ -297,7 +298,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
|
|||||||
case E_BLOCK_TRIPWIRE: return new cBlockTripwireHandler (a_BlockType);
|
case E_BLOCK_TRIPWIRE: return new cBlockTripwireHandler (a_BlockType);
|
||||||
case E_BLOCK_TRIPWIRE_HOOK: return new cBlockTripwireHookHandler (a_BlockType);
|
case E_BLOCK_TRIPWIRE_HOOK: return new cBlockTripwireHookHandler (a_BlockType);
|
||||||
case E_BLOCK_VINES: return new cBlockVineHandler (a_BlockType);
|
case E_BLOCK_VINES: return new cBlockVineHandler (a_BlockType);
|
||||||
case E_BLOCK_WALLSIGN: return new cBlockSignHandler (a_BlockType); // TODO: This needs a special handler
|
case E_BLOCK_WALLSIGN: return new cBlockWallSignHandler (a_BlockType);
|
||||||
case E_BLOCK_WATER: return new cBlockFluidHandler (a_BlockType);
|
case E_BLOCK_WATER: return new cBlockFluidHandler (a_BlockType);
|
||||||
case E_BLOCK_WOODEN_BUTTON: return new cBlockButtonHandler (a_BlockType);
|
case E_BLOCK_WOODEN_BUTTON: return new cBlockButtonHandler (a_BlockType);
|
||||||
case E_BLOCK_WOODEN_DOOR: return new cBlockDoorHandler (a_BlockType);
|
case E_BLOCK_WOODEN_DOOR: return new cBlockDoorHandler (a_BlockType);
|
||||||
|
@ -9,12 +9,14 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
class cBlockSignHandler :
|
class cBlockSignPostHandler :
|
||||||
public cBlockHandler
|
public cBlockHandler
|
||||||
{
|
{
|
||||||
|
typedef cBlockHandler super;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
cBlockSignHandler(BLOCKTYPE a_BlockType)
|
cBlockSignPostHandler(BLOCKTYPE a_BlockType) :
|
||||||
: cBlockHandler(a_BlockType)
|
super(a_BlockType)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,6 +33,17 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
|
||||||
|
{
|
||||||
|
if (a_RelY <= 0)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (cBlockInfo::IsSolid(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static NIBBLETYPE RotationToMetaData(double a_Rotation)
|
static NIBBLETYPE RotationToMetaData(double a_Rotation)
|
||||||
{
|
{
|
||||||
a_Rotation += 180 + (180 / 16); // So it's not aligned with axis
|
a_Rotation += 180 + (180 / 16); // So it's not aligned with axis
|
||||||
@ -45,23 +58,6 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static NIBBLETYPE DirectionToMetaData(eBlockFace a_Direction)
|
|
||||||
{
|
|
||||||
switch (a_Direction)
|
|
||||||
{
|
|
||||||
case 0x2: return 0x2;
|
|
||||||
case 0x3: return 0x3;
|
|
||||||
case 0x4: return 0x4;
|
|
||||||
case 0x5: return 0x5;
|
|
||||||
default:
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0x2;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
virtual void OnPlacedByPlayer(
|
virtual void OnPlacedByPlayer(
|
||||||
cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player,
|
cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player,
|
||||||
int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
|
int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
|
||||||
@ -84,6 +80,7 @@ public:
|
|||||||
return (a_Meta + 12) & 0x0f;
|
return (a_Meta + 12) & 0x0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) override
|
virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) override
|
||||||
{
|
{
|
||||||
// Mirrors signs over the XY plane (North-South Mirroring)
|
// Mirrors signs over the XY plane (North-South Mirroring)
|
89
src/Blocks/BlockWallSign.h
Normal file
89
src/Blocks/BlockWallSign.h
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "BlockHandler.h"
|
||||||
|
#include "../Entities/Player.h"
|
||||||
|
#include "Chunk.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class cBlockWallSignHandler :
|
||||||
|
public cBlockHandler
|
||||||
|
{
|
||||||
|
typedef cBlockHandler super;
|
||||||
|
|
||||||
|
public:
|
||||||
|
cBlockWallSignHandler(BLOCKTYPE a_BlockType) :
|
||||||
|
super(a_BlockType)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
||||||
|
{
|
||||||
|
a_Pickups.push_back(cItem(E_ITEM_SIGN, 1, 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
virtual const char * GetStepSound(void) override
|
||||||
|
{
|
||||||
|
return "step.wood";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
virtual void OnPlacedByPlayer(
|
||||||
|
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,
|
||||||
|
BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta
|
||||||
|
) override
|
||||||
|
{
|
||||||
|
a_Player->GetClientHandle()->SendEditSign(a_BlockX, a_BlockY, a_BlockZ);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
|
||||||
|
{
|
||||||
|
int BlockX = (a_Chunk.GetPosX() * cChunkDef::Width) + a_RelX;
|
||||||
|
int BlockZ = (a_Chunk.GetPosZ() * cChunkDef::Width) + a_RelZ;
|
||||||
|
GetBlockCoordsBehindTheSign(a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ), BlockX, BlockZ);
|
||||||
|
|
||||||
|
return (cBlockInfo::IsSolid(a_ChunkInterface.GetBlock(BlockX, a_RelY, BlockZ)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void GetBlockCoordsBehindTheSign(NIBBLETYPE a_BlockMeta, int & a_BlockX, int & a_BlockZ)
|
||||||
|
{
|
||||||
|
switch (a_BlockMeta)
|
||||||
|
{
|
||||||
|
case 2: a_BlockZ++; break;
|
||||||
|
case 3: a_BlockZ--; break;
|
||||||
|
case 4: a_BlockX++; break;
|
||||||
|
case 5: a_BlockX--; break;
|
||||||
|
default: break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static NIBBLETYPE DirectionToMetaData(eBlockFace a_Direction)
|
||||||
|
{
|
||||||
|
switch (a_Direction)
|
||||||
|
{
|
||||||
|
case 0x2: return 0x2;
|
||||||
|
case 0x3: return 0x3;
|
||||||
|
case 0x4: return 0x4;
|
||||||
|
case 0x5: return 0x5;
|
||||||
|
default:
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0x2;
|
||||||
|
}
|
||||||
|
} ;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -3,7 +3,8 @@
|
|||||||
|
|
||||||
#include "ItemHandler.h"
|
#include "ItemHandler.h"
|
||||||
#include "../World.h"
|
#include "../World.h"
|
||||||
#include "../Blocks/BlockSign.h"
|
#include "../Blocks/BlockSignPost.h"
|
||||||
|
#include "../Blocks/BlockWallSign.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -34,12 +35,12 @@ public:
|
|||||||
{
|
{
|
||||||
if (a_BlockFace == BLOCK_FACE_TOP)
|
if (a_BlockFace == BLOCK_FACE_TOP)
|
||||||
{
|
{
|
||||||
a_BlockMeta = cBlockSignHandler::RotationToMetaData(a_Player->GetYaw());
|
a_BlockMeta = cBlockSignPostHandler::RotationToMetaData(a_Player->GetYaw());
|
||||||
a_BlockType = E_BLOCK_SIGN_POST;
|
a_BlockType = E_BLOCK_SIGN_POST;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
a_BlockMeta = cBlockSignHandler::DirectionToMetaData(a_BlockFace);
|
a_BlockMeta = cBlockWallSignHandler::DirectionToMetaData(a_BlockFace);
|
||||||
a_BlockType = E_BLOCK_WALLSIGN;
|
a_BlockType = E_BLOCK_WALLSIGN;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user