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

Fixed spelling; Rotater to Rotator.

Browse Source
This commit is contained in:
narroo 2014-03-25 17:26:13 -04:00
parent e1285eb84f
commit 3df4f8609d
15 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Blocks/BlockBed.h
View File

@ -4,7 +4,7 @@
#include "BlockHandler.h" #include "BlockHandler.h"
#include "ChunkInterface.h" #include "ChunkInterface.h"
#include "WorldInterface.h" #include "WorldInterface.h"
#include "MetaRotater.h" #include "MetaRotator.h"
#include "../Entities/Player.h" #include "../Entities/Player.h"
@ -12,11 +12,11 @@
class cBlockBedHandler : class cBlockBedHandler :
public cMetaRotater<cBlockHandler, 0x3, 0x02, 0x03, 0x00, 0x01, true> public cMetaRotator<cBlockHandler, 0x3, 0x02, 0x03, 0x00, 0x01, true>
{ {
public: public:
cBlockBedHandler(BLOCKTYPE a_BlockType) cBlockBedHandler(BLOCKTYPE a_BlockType)
: cMetaRotater<cBlockHandler, 0x3, 0x02, 0x03, 0x00, 0x01,true>(a_BlockType) : cMetaRotator<cBlockHandler, 0x3, 0x02, 0x03, 0x00, 0x01,true>(a_BlockType)
{ {
} }

6
src/Blocks/BlockButton.h
View File

@ -2,17 +2,17 @@
#include "BlockHandler.h" #include "BlockHandler.h"
#include "Chunk.h" #include "Chunk.h"
#include "MetaRotater.h" #include "MetaRotator.h"
class cBlockButtonHandler : class cBlockButtonHandler :
public cMetaRotater<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, true> public cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, true>
{ {
public: public:
cBlockButtonHandler(BLOCKTYPE a_BlockType) cBlockButtonHandler(BLOCKTYPE a_BlockType)
: cMetaRotater<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, true>(a_BlockType) : cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, true>(a_BlockType)
{ {
} }

6
src/Blocks/BlockChest.h
View File

@ -4,18 +4,18 @@
#include "BlockEntity.h" #include "BlockEntity.h"
#include "../BlockArea.h" #include "../BlockArea.h"
#include "../Entities/Player.h" #include "../Entities/Player.h"
#include "MetaRotater.h" #include "MetaRotator.h"
class cBlockChestHandler : class cBlockChestHandler :
public cMetaRotater<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04> public cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>
{ {
public: public:
cBlockChestHandler(BLOCKTYPE a_BlockType) cBlockChestHandler(BLOCKTYPE a_BlockType)
: cMetaRotater<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType) : cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType)
{ {
} }

6
src/Blocks/BlockComparator.h
View File

@ -3,18 +3,18 @@
#include "BlockHandler.h" #include "BlockHandler.h"
#include "BlockRedstoneRepeater.h" #include "BlockRedstoneRepeater.h"
#include "MetaRotater.h" #include "MetaRotator.h"
class cBlockComparatorHandler : class cBlockComparatorHandler :
public cMetaRotater<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true> public cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>
{ {
public: public:
cBlockComparatorHandler(BLOCKTYPE a_BlockType) cBlockComparatorHandler(BLOCKTYPE a_BlockType)
: cMetaRotater<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>(a_BlockType) : cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>(a_BlockType)
{ {
} }

6
src/Blocks/BlockDoor.h
View File

@ -4,15 +4,15 @@
#include "BlockHandler.h" #include "BlockHandler.h"
#include "../Entities/Player.h" #include "../Entities/Player.h"
#include "Chunk.h" #include "Chunk.h"
#include "MetaRotater.h" #include "MetaRotator.h"
class cBlockDoorHandler : class cBlockDoorHandler :
public cMetaRotater<cBlockHandler, 0x03, 0x01, 0x02, 0x03, 0x00, true> public cMetaRotator<cBlockHandler, 0x03, 0x01, 0x02, 0x03, 0x00, true>
{ {
typedef cMetaRotater<cBlockHandler, 0x03, 0x01, 0x02, 0x03, 0x00, true> super; typedef cMetaRotator<cBlockHandler, 0x03, 0x01, 0x02, 0x03, 0x00, true> super;
public: public:
cBlockDoorHandler(BLOCKTYPE a_BlockType); cBlockDoorHandler(BLOCKTYPE a_BlockType);

6
src/Blocks/BlockDropSpenser.h
View File

@ -6,18 +6,18 @@
#pragma once #pragma once
#include "../Piston.h" #include "../Piston.h"
#include "MetaRotater.h" #include "MetaRotator.h"
class cBlockDropSpenserHandler : class cBlockDropSpenserHandler :
public cMetaRotater<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04> public cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>
{ {
public: public:
cBlockDropSpenserHandler(BLOCKTYPE a_BlockType) : cBlockDropSpenserHandler(BLOCKTYPE a_BlockType) :
cMetaRotater<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType) cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType)
{ {
} }

6
src/Blocks/BlockEnderchest.h
View File

@ -2,17 +2,17 @@
#pragma once #pragma once
#include "BlockEntity.h" #include "BlockEntity.h"
#include "MetaRotater.h" #include "MetaRotator.h"
class cBlockEnderchestHandler : class cBlockEnderchestHandler :
public cMetaRotater<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04> public cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>
{ {
public: public:
cBlockEnderchestHandler(BLOCKTYPE a_BlockType) cBlockEnderchestHandler(BLOCKTYPE a_BlockType)
: cMetaRotater<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType) : cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType)
{ {
} }

6
src/Blocks/BlockFenceGate.h
View File

@ -2,17 +2,17 @@
#pragma once #pragma once
#include "BlockHandler.h" #include "BlockHandler.h"
#include "MetaRotater.h" #include "MetaRotator.h"
class cBlockFenceGateHandler : class cBlockFenceGateHandler :
public cMetaRotater<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01, true> public cMetaRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01, true>
{ {
public: public:
cBlockFenceGateHandler(BLOCKTYPE a_BlockType) : cBlockFenceGateHandler(BLOCKTYPE a_BlockType) :
cMetaRotater<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01, true>(a_BlockType) cMetaRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01, true>(a_BlockType)
{ {
} }

6
src/Blocks/BlockFurnace.h
View File

@ -4,17 +4,17 @@
#include "BlockEntity.h" #include "BlockEntity.h"
#include "../World.h" #include "../World.h"
#include "../Piston.h" #include "../Piston.h"
#include "MetaRotater.h" #include "MetaRotator.h"
class cBlockFurnaceHandler : class cBlockFurnaceHandler :
public cMetaRotater<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04> public cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>
{ {
public: public:
cBlockFurnaceHandler(BLOCKTYPE a_BlockType) cBlockFurnaceHandler(BLOCKTYPE a_BlockType)
: cMetaRotater<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType) : cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType)
{ {
} }

4
src/Blocks/BlockHopper.h
View File

@ -8,11 +8,11 @@
class cBlockHopperHandler : class cBlockHopperHandler :
public cMetaRotater<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04> public cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>
{ {
public: public:
cBlockHopperHandler(BLOCKTYPE a_BlockType) cBlockHopperHandler(BLOCKTYPE a_BlockType)
: cMetaRotater<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType) : cMetaRotator<cBlockEntityHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType)
{ {
} }

4
src/Blocks/BlockLadder.h
View File

@ -9,11 +9,11 @@
class cBlockLadderHandler : class cBlockLadderHandler :
public cMetaRotater<cBlockHandler, 0x07, 0x02, 0x05, 0x03, 0x04> public cMetaRotator<cBlockHandler, 0x07, 0x02, 0x05, 0x03, 0x04>
{ {
public: public:
cBlockLadderHandler(BLOCKTYPE a_BlockType) cBlockLadderHandler(BLOCKTYPE a_BlockType)
: cMetaRotater<cBlockHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType) : cMetaRotator<cBlockHandler, 0x07, 0x02, 0x05, 0x03, 0x04>(a_BlockType)
{ {
} }

6
src/Blocks/BlockStairs.h
View File

@ -2,17 +2,17 @@
#pragma once #pragma once
#include "BlockHandler.h" #include "BlockHandler.h"
#include "MetaRotater.h" #include "MetaRotator.h"
class cBlockStairsHandler : class cBlockStairsHandler :
public cMetaRotater<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true> public cMetaRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>
{ {
public: public:
cBlockStairsHandler(BLOCKTYPE a_BlockType) : cBlockStairsHandler(BLOCKTYPE a_BlockType) :
cMetaRotater<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>(a_BlockType) cMetaRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>(a_BlockType)
{ {
} }

6
src/Blocks/BlockTorch.h
View File

@ -2,17 +2,17 @@
#include "BlockHandler.h" #include "BlockHandler.h"
#include "../Chunk.h" #include "../Chunk.h"
#include "MetaRotater.h" #include "MetaRotator.h"
class cBlockTorchHandler : class cBlockTorchHandler :
public cMetaRotater<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2> public cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>
{ {
public: public:
cBlockTorchHandler(BLOCKTYPE a_BlockType) cBlockTorchHandler(BLOCKTYPE a_BlockType)
: cMetaRotater<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>(a_BlockType) : cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>(a_BlockType)
{ {
} }

2
src/Blocks/BlockVine.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "BlockHandler.h" #include "BlockHandler.h"
#include "MetaRotater.h" #include "MetaRotator.h"

16
src/Blocks/MetaRotator.h
View File

@ -1,4 +1,4 @@
// MetaRotater.h // MetaRotator.h
// Provides a mixin for rotations and reflections // Provides a mixin for rotations and reflections
@ -21,15 +21,15 @@ Inherit from this class providing your base class as Base, the BitMask for the d
*/ */
template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched = false> template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched = false>
class cMetaRotater : public Base class cMetaRotator : public Base
{ {
public: public:
cMetaRotater(BLOCKTYPE a_BlockType) : cMetaRotator(BLOCKTYPE a_BlockType) :
Base(a_BlockType) Base(a_BlockType)
{} {}
virtual ~cMetaRotater() {} virtual ~cMetaRotator() {}
virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) override; virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) override;
virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) override; virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) override;
@ -42,7 +42,7 @@ public:
template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched> template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
NIBBLETYPE cMetaRotater<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaRotateCW(NIBBLETYPE a_Meta) NIBBLETYPE cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaRotateCW(NIBBLETYPE a_Meta)
{ {
NIBBLETYPE OtherMeta = a_Meta & (~BitMask); NIBBLETYPE OtherMeta = a_Meta & (~BitMask);
switch (a_Meta & BitMask) switch (a_Meta & BitMask)
@ -64,7 +64,7 @@ NIBBLETYPE cMetaRotater<Base, BitMask, North, East, South, West, AssertIfNotMatc
template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched> template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
NIBBLETYPE cMetaRotater<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaRotateCCW(NIBBLETYPE a_Meta) NIBBLETYPE cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaRotateCCW(NIBBLETYPE a_Meta)
{ {
NIBBLETYPE OtherMeta = a_Meta & (~BitMask); NIBBLETYPE OtherMeta = a_Meta & (~BitMask);
switch (a_Meta & BitMask) switch (a_Meta & BitMask)
@ -86,7 +86,7 @@ NIBBLETYPE cMetaRotater<Base, BitMask, North, East, South, West, AssertIfNotMatc
template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched> template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
NIBBLETYPE cMetaRotater<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaMirrorXY(NIBBLETYPE a_Meta) NIBBLETYPE cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaMirrorXY(NIBBLETYPE a_Meta)
{ {
NIBBLETYPE OtherMeta = a_Meta & (~BitMask); NIBBLETYPE OtherMeta = a_Meta & (~BitMask);
switch (a_Meta & BitMask) switch (a_Meta & BitMask)
@ -103,7 +103,7 @@ NIBBLETYPE cMetaRotater<Base, BitMask, North, East, South, West, AssertIfNotMatc
template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched> template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
NIBBLETYPE cMetaRotater<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaMirrorYZ(NIBBLETYPE a_Meta) NIBBLETYPE cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaMirrorYZ(NIBBLETYPE a_Meta)
{ {
NIBBLETYPE OtherMeta = a_Meta & (~BitMask); NIBBLETYPE OtherMeta = a_Meta & (~BitMask);
switch (a_Meta & BitMask) switch (a_Meta & BitMask)