Merge branch 'develop' into rooms

server/accounts/account_manager.hpp

@@ -25,11 +25,7 @@
 #include "account_data.hpp"
 #include "singleton.hpp"
 
-#if defined(__MINGW32__)
- #include "sqlite3/sqlite3.h"
-#else
- #include "sqlite3.h"
-#endif
+#include "sqlite3.h"
 
 #include <functional>
 #include <map>

server/characters/character_api.hpp

@@ -22,11 +22,7 @@
 #ifndef CHARACTERAPI_HPP_
 #define CHARACTERAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #define TORTUGA_CHARACTER_API "character"
 LUAMOD_API int openCharacterAPI(lua_State* L);

server/characters/character_manager.cpp

@@ -21,11 +21,7 @@
 */
 #include "character_manager.hpp"
 
-#if defined(__MINGW32__)
- #include "sqlite3/sqlite3.h"
-#else
- #include "sqlite3.h"
-#endif
+#include "sqlite3.h"
 
 #include <algorithm>
 #include <stdexcept>

server/characters/character_manager.hpp

@@ -25,11 +25,7 @@
 #include "character_data.hpp"
 #include "singleton.hpp"
 
-#if defined(__MINGW32__)
- #include "sqlite3/sqlite3.h"
-#else
- #include "sqlite3.h"
-#endif
+#include "sqlite3.h"
 
 #include <functional>
 #include <map>

server/characters/character_manager_api.hpp

@@ -22,11 +22,7 @@
 #ifndef CHARACTERMANAGERAPI_HPP_
 #define CHARACTERMANAGERAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #define TORTUGA_CHARACTER_MANAGER_API "character_manager"
 LUAMOD_API int openCharacterManagerAPI(lua_State* L);

server/entities/entity_api.hpp

@@ -22,11 +22,7 @@
 #ifndef ENTITYAPI_HPP_
 #define ENTITYAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #define TORTUGA_ENTITY_API "entity"
 LUAMOD_API int openEntityAPI(lua_State* L);

server/linit.cpp

@@ -34,11 +34,7 @@
 #define linit_c
 #define LUA_LIB
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #include "map_system_api.hpp"
 #include "room_system_api.hpp"

server/monsters/monster_api.hpp

@@ -22,11 +22,7 @@
 #ifndef MONSTERAPI_HPP_
 #define MONSTERAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #define TORTUGA_MONSTER_API "monster"
 LUAMOD_API int openMonsterAPI(lua_State* L);

server/monsters/monster_manager.hpp

@@ -25,13 +25,8 @@
 #include "monster_data.hpp"
 #include "singleton.hpp"
 
-#ifdef __unix__
- #include "lua.hpp"
- #include "sqlite3.h"
-#else
- #include "lua/lua.hpp"
- #include "sqlite3/sqlite3.h"
-#endif
+#include "lua.hpp"
+#include "sqlite3.h"
 
 #include <functional>
 #include <map>

server/monsters/monster_manager_api.hpp

@@ -22,11 +22,7 @@
 #ifndef MONSTERMANAGERAPI_HPP_
 #define MONSTERMANAGERAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #define TORTUGA_MONSTER_MANAGER_API "monster_manager"
 LUAMOD_API int openMonsterManagerAPI(lua_State* L);

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);

server/server_application.hpp

@@ -39,13 +39,8 @@
 #include "singleton.hpp"
 
 //APIs
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
- #include "sqlite3/sqlite3.h"
-#else
- #include "lua.hpp"
- #include "sqlite3.h"
-#endif
+#include "lua.hpp"
+#include "sqlite3.h"
 
 #include "SDL/SDL.h"
 

server/server_utilities/sql_tools.hpp

@@ -22,11 +22,7 @@
 #ifndef SERVERUTILITY_HPP_
 #define SERVERUTILITY_HPP_
 
-#if defined(__MINGW32__)
- #include "sqlite3/sqlite3.h"
-#else
- #include "sqlite3.h"
-#endif
+#include "sqlite3.h"
 
 #include <string>
 

server/waypoints/waypoint_api.hpp

@@ -22,11 +22,7 @@
 #ifndef WAYPOINTAPI_HPP_
 #define WAYPOINTAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #define TORTUGA_WAYPOINT_API "waypoint"
 LUAMOD_API int openWaypointAPI(lua_State* L);

server/waypoints/waypoint_data.hpp

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

server/waypoints/waypoint_manager.hpp

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

server/waypoints/waypoint_manager_api.hpp

@@ -22,11 +22,7 @@
 #ifndef WAYPOINTMANAGERAPI_HPP_
 #define WAYPOINTMANAGERAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #define TORTUGA_WAYPOINT_MANAGER_API "waypoint_manager"
 LUAMOD_API int openWaypointManagerAPI(lua_State* L);

server/waypoints/waypoint_system_api.hpp

@@ -22,11 +22,7 @@
 #ifndef WAYPOINTSYSTEMAPI_HPP_
 #define WAYPOINTSYSTEMAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua.hpp"
 
 #define TORTUGA_WAYPOINT_SYSTEM_API "waypoint_system"
 LUAMOD_API int openWaypointSystemAPI(lua_State* L);