diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-09-26 22:23:36 +0200 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-09-26 22:23:36 +0200 |
commit | af997a09ca1ff2bf3e93f9145edc50d29be28529 (patch) | |
tree | 8188753488f633407eea5aab0c9e6e0833300e43 /src/Simulator/Simulator.cpp | |
parent | Fixed players custom name in 1.8 (diff) | |
parent | Merge pull request #1455 from mc-server/includes (diff) | |
download | cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.gz cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.bz2 cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.lz cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.xz cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.zst cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.zip |
Diffstat (limited to 'src/Simulator/Simulator.cpp')
-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>; |