diff options
Diffstat (limited to '')
| -rw-r--r-- | source/Entities/Entity.cpp (renamed from source/Entity.cpp) | 22 | ||||
| -rw-r--r-- | source/Entities/Entity.h (renamed from source/Entity.h) | 6 | ||||
| -rw-r--r-- | source/Entities/FallingBlock.cpp (renamed from source/FallingBlock.cpp) | 8 | ||||
| -rw-r--r-- | source/Entities/FallingBlock.h (renamed from source/FallingBlock.h) | 1 | ||||
| -rw-r--r-- | source/Entities/Minecart.cpp (renamed from source/Minecart.cpp) | 4 | ||||
| -rw-r--r-- | source/Entities/Minecart.h (renamed from source/Minecart.h) | 2 | ||||
| -rw-r--r-- | source/Entities/Pawn.cpp (renamed from source/Pawn.cpp) | 8 | ||||
| -rw-r--r-- | source/Entities/Pawn.h (renamed from source/Pawn.h) | 1 | ||||
| -rw-r--r-- | source/Entities/Pickup.cpp (renamed from source/Pickup.cpp) | 25 | ||||
| -rw-r--r-- | source/Entities/Pickup.h (renamed from source/Pickup.h) | 2 | ||||
| -rw-r--r-- | source/Entities/Player.cpp (renamed from source/Player.cpp) | 46 | ||||
| -rw-r--r-- | source/Entities/Player.h (renamed from source/Player.h) | 4 | ||||
| -rw-r--r-- | source/Entities/TNTEntity.cpp (renamed from source/TNTEntity.cpp) | 4 | ||||
| -rw-r--r-- | source/Entities/TNTEntity.h (renamed from source/TNTEntity.h) | 1 |
14 files changed, 61 insertions, 73 deletions
diff --git a/source/Entity.cpp b/source/Entities/Entity.cpp index 8afdfdb95..19a65ef4e 100644 --- a/source/Entity.cpp +++ b/source/Entities/Entity.cpp @@ -2,17 +2,17 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Entity.h" -#include "World.h" -#include "Server.h" -#include "Root.h" -#include "Vector3d.h" -#include "Matrix4f.h" -#include "ReferenceManager.h" -#include "ClientHandle.h" -#include "Tracer.h" -#include "Chunk.h" -#include "Simulator/FluidSimulator.h" -#include "PluginManager.h" +#include "../World.h" +#include "../Server.h" +#include "../Root.h" +#include "../Vector3d.h" +#include "../Matrix4f.h" +#include "../ReferenceManager.h" +#include "../ClientHandle.h" +#include "../Chunk.h" +#include "../Simulator/FluidSimulator.h" +#include "../PluginManager.h" +#include "../Tracer.h" diff --git a/source/Entity.h b/source/Entities/Entity.h index c9d26e1a1..820405cb9 100644 --- a/source/Entity.h +++ b/source/Entities/Entity.h @@ -1,9 +1,9 @@ #pragma once -#include "Item.h" -#include "Vector3d.h" -#include "Vector3f.h" +#include "../Item.h" +#include "../Vector3d.h" +#include "../Vector3f.h" diff --git a/source/FallingBlock.cpp b/source/Entities/FallingBlock.cpp index 05766ae01..237327975 100644 --- a/source/FallingBlock.cpp +++ b/source/Entities/FallingBlock.cpp @@ -1,10 +1,10 @@ #include "Globals.h" #include "FallingBlock.h" -#include "World.h" -#include "ClientHandle.h" -#include "Simulator/SandSimulator.h" -#include "Chunk.h" +#include "../World.h" +#include "../ClientHandle.h" +#include "../Simulator/SandSimulator.h" +#include "../Chunk.h" diff --git a/source/FallingBlock.h b/source/Entities/FallingBlock.h index 492931fa3..13931f061 100644 --- a/source/FallingBlock.h +++ b/source/Entities/FallingBlock.h @@ -2,7 +2,6 @@ #pragma once #include "Entity.h" -#include "Defines.h" diff --git a/source/Minecart.cpp b/source/Entities/Minecart.cpp index 8b9c201ad..3e6069237 100644 --- a/source/Minecart.cpp +++ b/source/Entities/Minecart.cpp @@ -5,8 +5,8 @@ #include "Globals.h" #include "Minecart.h" -#include "World.h" -#include "ClientHandle.h" +#include "../World.h" +#include "../ClientHandle.h" #include "Player.h" diff --git a/source/Minecart.h b/source/Entities/Minecart.h index d78739fc5..91336673d 100644 --- a/source/Minecart.h +++ b/source/Entities/Minecart.h @@ -10,7 +10,7 @@ #pragma once #include "Entity.h" -#include "Item.h" +#include "../Item.h" diff --git a/source/Pawn.cpp b/source/Entities/Pawn.cpp index b58c2b544..fffefd538 100644 --- a/source/Pawn.cpp +++ b/source/Entities/Pawn.cpp @@ -2,14 +2,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Pawn.h" -#include "Root.h" -#include "Server.h" -#include "World.h" -#include "Player.h" -#include "PluginManager.h" -#include "Vector3d.h" -#include "BlockID.h" -#include "Defines.h" diff --git a/source/Pawn.h b/source/Entities/Pawn.h index b1b8c71ec..e76337d86 100644 --- a/source/Pawn.h +++ b/source/Entities/Pawn.h @@ -2,7 +2,6 @@ #pragma once #include "Entity.h" -#include "Item.h" diff --git a/source/Pickup.cpp b/source/Entities/Pickup.cpp index 217af969c..0417b861d 100644 --- a/source/Pickup.cpp +++ b/source/Entities/Pickup.cpp @@ -6,20 +6,19 @@ #endif #include "Pickup.h" -#include "ClientHandle.h" -#include "Inventory.h" -#include "World.h" -#include "Simulator/FluidSimulator.h" -#include "Server.h" +#include "../ClientHandle.h" +#include "../Inventory.h" +#include "../World.h" +#include "../Simulator/FluidSimulator.h" +#include "../Server.h" #include "Player.h" -#include "PluginManager.h" -#include "Item.h" -#include "Root.h" -#include "Tracer.h" -#include "Chunk.h" - -#include "Vector3d.h" -#include "Vector3f.h" +#include "../PluginManager.h" +#include "../Item.h" +#include "../Root.h" +#include "../Chunk.h" + +#include "../Vector3d.h" +#include "../Vector3f.h" diff --git a/source/Pickup.h b/source/Entities/Pickup.h index dcdc02137..1f32c97b5 100644 --- a/source/Pickup.h +++ b/source/Entities/Pickup.h @@ -2,7 +2,7 @@ #pragma once #include "Entity.h" -#include "Item.h" +#include "../Item.h" diff --git a/source/Player.cpp b/source/Entities/Player.cpp index 13009dad8..8ad071453 100644 --- a/source/Player.cpp +++ b/source/Entities/Player.cpp @@ -2,30 +2,30 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Player.h" -#include "Server.h" -#include "ClientHandle.h" -#include "UI/Window.h" -#include "UI/WindowOwner.h" -#include "World.h" +#include "../Server.h" +#include "../ClientHandle.h" +#include "../UI/Window.h" +#include "../UI/WindowOwner.h" +#include "../World.h" #include "Pickup.h" -#include "PluginManager.h" -#include "BlockEntities/BlockEntity.h" -#include "GroupManager.h" -#include "Group.h" -#include "ChatColor.h" -#include "Item.h" -#include "Tracer.h" -#include "Root.h" -#include "OSSupport/MakeDir.h" -#include "OSSupport/Timer.h" -#include "MersenneTwister.h" -#include "Chunk.h" -#include "Items/ItemHandler.h" - -#include "Vector3d.h" -#include "Vector3f.h" - -#include "../iniFile/iniFile.h" +#include "../PluginManager.h" +#include "../BlockEntities/BlockEntity.h" +#include "../GroupManager.h" +#include "../Group.h" +#include "../ChatColor.h" +#include "../Item.h" +#include "../Tracer.h" +#include "../Root.h" +#include "../OSSupport/MakeDir.h" +#include "../OSSupport/Timer.h" +#include "../MersenneTwister.h" +#include "../Chunk.h" +#include "../Items/ItemHandler.h" + +#include "../Vector3d.h" +#include "../Vector3f.h" + +#include "../../iniFile/iniFile.h" #include <json/json.h> #define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x)) diff --git a/source/Player.h b/source/Entities/Player.h index 2a1797c79..62595f980 100644 --- a/source/Player.h +++ b/source/Entities/Player.h @@ -2,8 +2,8 @@ #pragma once #include "Pawn.h" -#include "Inventory.h" -#include "Defines.h" +#include "../Inventory.h" +#include "../Defines.h" diff --git a/source/TNTEntity.cpp b/source/Entities/TNTEntity.cpp index 60625667d..43a0dea09 100644 --- a/source/TNTEntity.cpp +++ b/source/Entities/TNTEntity.cpp @@ -1,8 +1,8 @@ #include "Globals.h" #include "TNTEntity.h" -#include "World.h" -#include "ClientHandle.h" +#include "../World.h" +#include "../ClientHandle.h" diff --git a/source/TNTEntity.h b/source/Entities/TNTEntity.h index e3eae24f2..ae6fc75e2 100644 --- a/source/TNTEntity.h +++ b/source/Entities/TNTEntity.h @@ -2,7 +2,6 @@ #pragma once #include "Entity.h" -#include "Defines.h" |