diff options
| author | worktycho <work.tycho@gmail.com> | 2014-09-26 17:04:26 +0200 |
|---|---|---|
| committer | worktycho <work.tycho@gmail.com> | 2014-09-26 17:04:26 +0200 |
| commit | 411c69b420acdc1e103a76a1a52e2c488aee5718 (patch) | |
| tree | 06e33fb4b17d9c782ebb834a9821571f11ae103c /src/Simulator/Simulator.cpp | |
| parent | Improved searching for spawn. (diff) | |
| parent | Merge branch 'master' into redstoneTests (diff) | |
| download | cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.gz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.bz2 cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.lz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.xz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.zst cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Simulator/Simulator.cpp | 45 |
1 files changed, 4 insertions, 41 deletions
diff --git a/src/Simulator/Simulator.cpp b/src/Simulator/Simulator.cpp index 0739f0187..d26702166 100644 --- a/src/Simulator/Simulator.cpp +++ b/src/Simulator/Simulator.cpp @@ -1,50 +1,13 @@ -#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules +#include "Globals.h" -#include "Simulator.h" #include "../World.h" #include "../BlockID.h" #include "../Defines.h" #include "../Chunk.h" +#include "Simulator.inc" - - - -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); - } -} - - - +#pragma clang diagnostic ignored "-Wweak-template-vtables" +template class cSimulator<cChunk, cWorld>; |