Merge branch 'develop' into rooms

server/rooms/room_api.hpp

@@ -22,11 +22,7 @@
 #ifndef ROOMAPI_HPP_
 #define ROOMAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #define TORTUGA_ROOM_API "room"
 LUAMOD_API int openRoomAPI(lua_State* L);

server/rooms/room_data.hpp

@@ -25,11 +25,7 @@
 #include "entity.hpp"
 #include "region_pager_lua.hpp"
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #include <list>
 #include <string>

server/rooms/room_manager.hpp

@@ -26,11 +26,7 @@
 #include "room_data.hpp"
 #include "singleton.hpp"
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #include <functional>
 #include <map>

server/rooms/room_manager_api.hpp

@@ -22,11 +22,7 @@
 #ifndef ROOMMANAGERAPI_HPP_
 #define ROOMMANAGERAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #define TORTUGA_ROOM_MANAGER_API "room_manager"
 LUAMOD_API int openRoomManagerAPI(lua_State* L);

server/rooms/room_system_api.hpp

@@ -22,11 +22,7 @@
 #ifndef ROOMSYSTEMAPI_HPP_
 #define ROOMSYSTEMAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #define TORTUGA_ROOM_SYSTEM_API "room_system"
 LUAMOD_API int openRoomSystemAPI(lua_State* L);