diff options
Diffstat (limited to 'src/Simulator')
17 files changed, 16 insertions, 22 deletions
diff --git a/src/Simulator/CMakeLists.txt b/src/Simulator/CMakeLists.txt index ab17eebe3..c8514d91d 100644 --- a/src/Simulator/CMakeLists.txt +++ b/src/Simulator/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS DelayedFluidSimulator.cpp diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp index 927a7ae22..df2456455 100644 --- a/src/Simulator/FireSimulator.cpp +++ b/src/Simulator/FireSimulator.cpp @@ -5,7 +5,7 @@ #include "../World.h" #include "../Defines.h" #include "../Chunk.h" -#include "Root.h" +#include "../Root.h" #include "../Bindings/PluginManager.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt b/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt index 15da35db0..fdce1bff5 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt +++ b/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") set (SRCS IncrementalRedstoneSimulator.cpp diff --git a/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h b/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h index 672a4927b..f059c5fb3 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "BlockEntities/CommandBlockEntity.h" +#include "../../BlockEntities/CommandBlockEntity.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h index e1a884337..d29a2f4da 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockDoor.h" +#include "../../Blocks/BlockDoor.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h b/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h index 295afd34e..4dd8b4493 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "BlockEntities/DropSpenserEntity.h" +#include "../../BlockEntities/DropSpenserEntity.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp index 87853f0ff..2c56646fe 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp +++ b/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp @@ -3,7 +3,7 @@ #include "Globals.h" #include "IncrementalRedstoneSimulator.h" -#include "Chunk.h" +#include "../../Chunk.h" #include "CommandBlockHandler.h" #include "DoorHandler.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h b/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h index 46fcd6716..347778881 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "BlockEntities/NoteEntity.h" +#include "../../BlockEntities/NoteEntity.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h b/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h index de001a9e5..b91596be9 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockPiston.h" +#include "../../Blocks/BlockPiston.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h b/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h index 22cfc17f9..8c37c629e 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "BoundingBox.h" +#include "../../BoundingBox.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h index 8c33ae266..1f78082c4 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockComparator.h" +#include "../../Blocks/BlockComparator.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h index 788a3c337..2d0ac97b9 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h @@ -1,7 +1,7 @@ #pragma once -#include "World.h" +#include "../../World.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h index 5f4898804..0263d47cf 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockRedstoneRepeater.h" +#include "../../Blocks/BlockRedstoneRepeater.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h index d5bf78399..ad64f76db 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h @@ -2,8 +2,8 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockButton.h" -#include "Blocks/BlockLever.h" +#include "../../Blocks/BlockButton.h" +#include "../../Blocks/BlockLever.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h b/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h index ea0eaa900..f6bd81930 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "BlockEntities/ChestEntity.h" +#include "../../BlockEntities/ChestEntity.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h b/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h index 47225715f..132df3327 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockTripwireHook.h" +#include "../../Blocks/BlockTripwireHook.h" diff --git a/src/Simulator/RedstoneSimulator.h b/src/Simulator/RedstoneSimulator.h index 2f6b32398..8a29d7a29 100644 --- a/src/Simulator/RedstoneSimulator.h +++ b/src/Simulator/RedstoneSimulator.h @@ -1,7 +1,7 @@ #pragma once -#include "Simulator/Simulator.h" +#include "Simulator.h" |