summaryrefslogtreecommitdiffstats
path: root/src/Simulator
diff options
context:
space:
mode:
Diffstat (limited to 'src/Simulator')
-rw-r--r--src/Simulator/FireSimulator.cpp1
-rw-r--r--src/Simulator/FireSimulator.h1
-rw-r--r--src/Simulator/FloodyFluidSimulator.cpp1
-rw-r--r--src/Simulator/SandSimulator.cpp3
-rw-r--r--src/Simulator/SandSimulator.h1
-rw-r--r--src/Simulator/VanillaFluidSimulator.cpp1
6 files changed, 7 insertions, 1 deletions
diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp
index 304450b3c..2a9d6c289 100644
--- a/src/Simulator/FireSimulator.cpp
+++ b/src/Simulator/FireSimulator.cpp
@@ -2,6 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "FireSimulator.h"
+#include "../BlockInfo.h"
#include "../World.h"
#include "../Defines.h"
#include "../Chunk.h"
diff --git a/src/Simulator/FireSimulator.h b/src/Simulator/FireSimulator.h
index 236be5686..f36407584 100644
--- a/src/Simulator/FireSimulator.h
+++ b/src/Simulator/FireSimulator.h
@@ -2,6 +2,7 @@
#pragma once
#include "Simulator.h"
+#include "../IniFile.h"
diff --git a/src/Simulator/FloodyFluidSimulator.cpp b/src/Simulator/FloodyFluidSimulator.cpp
index b620dddce..14573e0de 100644
--- a/src/Simulator/FloodyFluidSimulator.cpp
+++ b/src/Simulator/FloodyFluidSimulator.cpp
@@ -7,6 +7,7 @@
#include "Globals.h"
#include "FloodyFluidSimulator.h"
+#include "../BlockInfo.h"
#include "../World.h"
#include "../Chunk.h"
#include "../BlockArea.h"
diff --git a/src/Simulator/SandSimulator.cpp b/src/Simulator/SandSimulator.cpp
index 5f0595d48..42bb521ed 100644
--- a/src/Simulator/SandSimulator.cpp
+++ b/src/Simulator/SandSimulator.cpp
@@ -2,6 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "SandSimulator.h"
+#include "../BlockInfo.h"
#include "../World.h"
#include "../Defines.h"
#include "../Entities/FallingBlock.h"
@@ -283,7 +284,7 @@ void cSandSimulator::FinishFalling(
// Create a pickup instead:
cItems Pickups;
- Pickups.Add(static_cast<ENUM_ITEM_ID>(a_FallingBlockType), 1, a_FallingBlockMeta);
+ Pickups.Add(static_cast<ENUM_ITEM_TYPE>(a_FallingBlockType), 1, a_FallingBlockMeta);
a_World->SpawnItemPickups(
Pickups,
static_cast<double>(a_BlockX) + 0.5,
diff --git a/src/Simulator/SandSimulator.h b/src/Simulator/SandSimulator.h
index cee0a85e6..d7a27edd4 100644
--- a/src/Simulator/SandSimulator.h
+++ b/src/Simulator/SandSimulator.h
@@ -2,6 +2,7 @@
#pragma once
#include "Simulator.h"
+#include "../IniFile.h"
diff --git a/src/Simulator/VanillaFluidSimulator.cpp b/src/Simulator/VanillaFluidSimulator.cpp
index f6fe1e9ec..0fc84be59 100644
--- a/src/Simulator/VanillaFluidSimulator.cpp
+++ b/src/Simulator/VanillaFluidSimulator.cpp
@@ -4,6 +4,7 @@
#include "Globals.h"
#include "VanillaFluidSimulator.h"
+#include "../BlockInfo.h"
#include "../World.h"
#include "../Chunk.h"
#include "../BlockArea.h"