From 770ef8c60b1adbbf73a091a0c8225366c32f90b5 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Tue, 26 Nov 2013 17:14:46 +0000 Subject: [PATCH] Fixed loads more of them. --- src/BlockID.cpp | 2 +- src/Chunk.cpp | 2 +- src/GroupManager.cpp | 2 +- src/Inventory.cpp | 2 +- src/LuaState.cpp | 2 +- src/LuaState.h | 2 +- src/MonsterConfig.cpp | 2 +- src/RCONServer.cpp | 2 +- src/Server.h | 4 ++-- src/StringCompression.h | 2 +- src/tolua++.h | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/BlockID.cpp b/src/BlockID.cpp index 003f49848..708618d25 100644 --- a/src/BlockID.cpp +++ b/src/BlockID.cpp @@ -4,7 +4,7 @@ #include "Globals.h" #include "BlockID.h" -#include "../lib/inifile/iniFile.h" +#include "inifile/iniFile.h" #include "Item.h" #include "Mobs/Monster.h" diff --git a/src/Chunk.cpp b/src/Chunk.cpp index ec60a19bf..83f866e56 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -10,7 +10,7 @@ #include "World.h" #include "ClientHandle.h" #include "Server.h" -#include "../lib/zlib/zlib.h" +#include "zlib/zlib.h" #include "Defines.h" #include "BlockEntities/ChestEntity.h" #include "BlockEntities/DispenserEntity.h" diff --git a/src/GroupManager.cpp b/src/GroupManager.cpp index 55065b38e..df609f05b 100644 --- a/src/GroupManager.cpp +++ b/src/GroupManager.cpp @@ -2,7 +2,7 @@ #include "GroupManager.h" #include "Group.h" -#include "../lib/inifile/iniFile.h" +#include "inifile/iniFile.h" #include "ChatColor.h" #include "Root.h" diff --git a/src/Inventory.cpp b/src/Inventory.cpp index 3939598d7..b9c7f4aaf 100644 --- a/src/Inventory.cpp +++ b/src/Inventory.cpp @@ -9,7 +9,7 @@ #include "Root.h" #include "World.h" -#include "../lib/jsoncpp/include/json/json.h" +#include "jsoncpp/include/json/json.h" #include "Items/ItemHandler.h" diff --git a/src/LuaState.cpp b/src/LuaState.cpp index 3a0008d4f..6be1ee58c 100644 --- a/src/LuaState.cpp +++ b/src/LuaState.cpp @@ -8,7 +8,7 @@ extern "C" { - #include"lib/lua/src/lualib.h" + #include "lua/src/lualib.h" } #include "tolua++.h" diff --git a/src/LuaState.h b/src/LuaState.h index 9a486bfd1..5e7f3d180 100644 --- a/src/LuaState.h +++ b/src/LuaState.h @@ -26,7 +26,7 @@ automatic resource management. extern "C" { - #include "../lib/lua/src/lauxlib.h" + #include "lua/src/lauxlib.h" } diff --git a/src/MonsterConfig.cpp b/src/MonsterConfig.cpp index b72324124..6165606f0 100644 --- a/src/MonsterConfig.cpp +++ b/src/MonsterConfig.cpp @@ -3,7 +3,7 @@ #include "MonsterConfig.h" #include "Mobs/Monster.h" -#include "../lib/inifile/iniFile.h" +#include "inifile/iniFile.h" diff --git a/src/RCONServer.cpp b/src/RCONServer.cpp index f90e9f191..72f2d9ba9 100644 --- a/src/RCONServer.cpp +++ b/src/RCONServer.cpp @@ -4,7 +4,7 @@ // Implements the cRCONServer class representing the RCON server #include "Globals.h" -#include "../lib/inifile/iniFile.h" +#include "inifile/iniFile.h" #include "RCONServer.h" #include "Server.h" #include "Root.h" diff --git a/src/Server.h b/src/Server.h index 93a978654..0d93469a5 100644 --- a/src/Server.h +++ b/src/Server.h @@ -11,8 +11,8 @@ #include "OSSupport/SocketThreads.h" #include "OSSupport/ListenThread.h" -#include "../lib/cryptopp/rsa.h" -#include "../lib/cryptopp/randpool.h" +#include "cryptopp/rsa.h" +#include "cryptopp/randpool.h" #include "RCONServer.h" diff --git a/src/StringCompression.h b/src/StringCompression.h index 1257d7d6b..459e8f568 100644 --- a/src/StringCompression.h +++ b/src/StringCompression.h @@ -3,7 +3,7 @@ // Interfaces to the wrapping functions for compression and decompression using AString as their data -#include "../lib/zlib/zlib.h" // Needed for the Z_XXX return values +#include "zlib/zlib.h" // Needed for the Z_XXX return values diff --git a/src/tolua++.h b/src/tolua++.h index dff1e91be..8da427fe3 100644 --- a/src/tolua++.h +++ b/src/tolua++.h @@ -43,8 +43,8 @@ extern "C" { typedef int lua_Object; -#include "../lib/lua/src/lua.h" -#include "../lib/lua/src/lauxlib.h" +#include "lua/src/lua.h" +#include "lua/src/lauxlib.h" struct tolua_Error {