From 3b790bbf67861af40947bbb00725fdb22151b61a Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Wed, 27 Nov 2013 07:27:19 +0000 Subject: Fixed some of tiger's derpyness. --- src/Authenticator.cpp | 2 +- src/Bindings.cpp | 2 +- src/Chunk.cpp | 2 +- src/Entities/Player.cpp | 4 ++-- src/HTTPServer/HTTPServer.h | 2 +- src/LuaWindow.cpp | 2 +- src/ManualBindings.cpp | 2 +- src/Protocol/Protocol132.h | 4 ++-- src/Root.cpp | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Authenticator.cpp b/src/Authenticator.cpp index 4147e1eb2..4cbe3beed 100644 --- a/src/Authenticator.cpp +++ b/src/Authenticator.cpp @@ -6,7 +6,7 @@ #include "Root.h" #include "Server.h" -#include "lib/inifile/iniFile.h" +#include "inifile/iniFile.h" #include diff --git a/src/Bindings.cpp b/src/Bindings.cpp index 942ea0eaf..f06fb4c03 100644 --- a/src/Bindings.cpp +++ b/src/Bindings.cpp @@ -16,7 +16,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S); #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "tolua_base.h" #include "ChunkDef.h" -#include "../lib/inifile/iniFile.h" +#include "inifile/iniFile.h" #include "OSSupport/File.h" #include "BlockID.h" #include "StringUtils.h" diff --git a/src/Chunk.cpp b/src/Chunk.cpp index 83f866e56..c4aafaa8f 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -34,7 +34,7 @@ #include "MobSpawner.h" -#include "lib/jsoncpp/include/json/json.h" +#include "jsoncpp/include/json/json.h" diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index bc01ba716..a27405839 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -24,8 +24,8 @@ #include "../Vector3d.h" #include "../Vector3f.h" -#include "lib/inifile/iniFile.h" -#include "lib/jsoncpp/include/json/json.h" +#include "inifile/iniFile.h" +#include "jsoncpp/include/json/json.h" #define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x)) diff --git a/src/HTTPServer/HTTPServer.h b/src/HTTPServer/HTTPServer.h index ed7a03519..24baf8c95 100644 --- a/src/HTTPServer/HTTPServer.h +++ b/src/HTTPServer/HTTPServer.h @@ -11,7 +11,7 @@ #include "../OSSupport/ListenThread.h" #include "../OSSupport/SocketThreads.h" -#include "lib/inifile/iniFile.h" +#include "inifile/iniFile.h" diff --git a/src/LuaWindow.cpp b/src/LuaWindow.cpp index f49ba2109..5f112f1e1 100644 --- a/src/LuaWindow.cpp +++ b/src/LuaWindow.cpp @@ -8,7 +8,7 @@ #include "UI/SlotArea.h" #include "PluginLua.h" #include "Entities/Player.h" -#include "lib/lua/src/lauxlib.h" // Needed for LUA_REFNIL +#include "lua/src/lauxlib.h" // Needed for LUA_REFNIL diff --git a/src/ManualBindings.cpp b/src/ManualBindings.cpp index 7ea382b76..02b3347f6 100644 --- a/src/ManualBindings.cpp +++ b/src/ManualBindings.cpp @@ -17,7 +17,7 @@ #include "BlockEntities/DropperEntity.h" #include "BlockEntities/FurnaceEntity.h" #include "BlockEntities/HopperEntity.h" -#include "lib/md5/md5.h" +#include "md5/md5.h" #include "LuaWindow.h" #include "LineBlockTracer.h" diff --git a/src/Protocol/Protocol132.h b/src/Protocol/Protocol132.h index 2023d7960..f76272b8d 100644 --- a/src/Protocol/Protocol132.h +++ b/src/Protocol/Protocol132.h @@ -10,8 +10,8 @@ #pragma once #include "Protocol125.h" -#include "lib/cryptopp/modes.h" -#include "lib/cryptopp/aes.h" +#include "cryptopp/modes.h" +#include "cryptopp/aes.h" diff --git a/src/Root.cpp b/src/Root.cpp index 13e0cc9cb..4a6abaf37 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -19,7 +19,7 @@ #include "DeadlockDetect.h" #include "OSSupport/Timer.h" -#include "lib/inifile/iniFile.h" +#include "inifile/iniFile.h" #ifdef _WIN32 #include -- cgit v1.2.3