diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-09-11 18:48:21 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-09-11 18:48:21 +0200 |
| commit | 0b044e1c83a62c266afaf0852ccbd5e7b01cec5e (patch) | |
| tree | d847314a2ee95b1a766dbb57a06b5ea7e42e687c /src/Simulator/Simulator.cpp | |
| parent | Merge branch 'master' of https://github.com/mc-server/MCServer (diff) | |
| download | cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.gz cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.bz2 cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.lz cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.xz cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.zst cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.zip | |
Diffstat (limited to 'src/Simulator/Simulator.cpp')
| -rw-r--r-- | src/Simulator/Simulator.cpp | 50 |
1 files changed, 4 insertions, 46 deletions
diff --git a/src/Simulator/Simulator.cpp b/src/Simulator/Simulator.cpp index 0739f0187..7b944382b 100644 --- a/src/Simulator/Simulator.cpp +++ b/src/Simulator/Simulator.cpp @@ -1,50 +1,8 @@ -#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules - -#include "Simulator.h" -#include "../World.h" -#include "../BlockID.h" -#include "../Defines.h" -#include "../Chunk.h" - - - - - -cSimulator::cSimulator(cWorld & a_World) - : m_World(a_World) -{ -} - - - - - -cSimulator::~cSimulator() -{ -} - - - - - -void cSimulator::WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) -{ - AddBlock(a_BlockX, a_BlockY, a_BlockZ, a_Chunk); - AddBlock(a_BlockX - 1, a_BlockY, a_BlockZ, a_Chunk->GetNeighborChunk(a_BlockX - 1, a_BlockZ)); - AddBlock(a_BlockX + 1, a_BlockY, a_BlockZ, a_Chunk->GetNeighborChunk(a_BlockX + 1, a_BlockZ)); - AddBlock(a_BlockX, a_BlockY, a_BlockZ - 1, a_Chunk->GetNeighborChunk(a_BlockX, a_BlockZ - 1)); - AddBlock(a_BlockX, a_BlockY, a_BlockZ + 1, a_Chunk->GetNeighborChunk(a_BlockX, a_BlockZ + 1)); - if (a_BlockY > 0) - { - AddBlock(a_BlockX, a_BlockY - 1, a_BlockZ, a_Chunk); - } - if (a_BlockY < cChunkDef::Height - 1) - { - AddBlock(a_BlockX, a_BlockY + 1, a_BlockZ, a_Chunk); - } -} - +#include "Globals.h" +#include "Simulator.inc" +#pragma clang diagnostic ignored "-Wweak-template-vtables" +template class cSimulator<cChunk, cWorld>; |