diff --git a/800OTClient/init.lua b/800OTClient/init.lua
index b5064fc..7708226 100644
--- a/800OTClient/init.lua
+++ b/800OTClient/init.lua
@@ -22,7 +22,7 @@ Servers = {
Evoulinia = "evolunia.net:7171:1098",
GarneraTest = "garnera-global.net:7171:1100",
LocalTestServ = "127.0.0.1:7171:1098:110:30:93" ]]
- Local = "127.0.0.1:7171:792",
+ --Local = "127.0.0.1:7171:792",
Vanilla = "login.sabrehaven.com:7171:792"
}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f4a132..2357229 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(cotire)
-add_compile_options(-Wall -Werror -pipe -fvisibility=hidden)
+add_compile_options(-Wall -pipe -fvisibility=hidden)
set(CMAKE_CXX_FLAGS_PERFORMANCE "${CMAKE_CXX_FLAGS_RELEASE} -march=native")
if (CMAKE_COMPILER_IS_GNUCXX)
@@ -20,6 +20,7 @@ include(FindCXX11)
include(FindLTO)
# Find packages.
+find_package(fmt)
find_package(Crypto++ REQUIRED)
find_package(GMP REQUIRED)
find_package(PugiXML REQUIRED)
@@ -50,7 +51,7 @@ add_subdirectory(src)
add_executable(tfs ${tfs_SRC})
include_directories(${MYSQL_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR} ${GMP_INCLUDE_DIR} ${Crypto++_INCLUDE_DIR})
-target_link_libraries(tfs ${MYSQL_CLIENT_LIBS} ${LUA_LIBRARIES} ${Boost_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${PUGIXML_LIBRARIES} ${ZLIB_LIBRARY} ${GMP_LIBRARIES} ${Crypto++_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(tfs ${MYSQL_CLIENT_LIBS} ${LUA_LIBRARIES} ${Boost_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${PUGIXML_LIBRARIES} ${ZLIB_LIBRARY} ${GMP_LIBRARIES} ${Crypto++_LIBRARIES} fmt::fmt ${CMAKE_THREAD_LIBS_INIT})
set_target_properties(tfs PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "src/otpch.h")
set_target_properties(tfs PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
diff --git a/data/world800/map-house.xml b/data/world800/map-house.xml
index aa1ef24..cadba0d 100644
--- a/data/world800/map-house.xml
+++ b/data/world800/map-house.xml
@@ -349,7 +349,7 @@
-
+
@@ -1026,4 +1026,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/world800/map-spawn.xml b/data/world800/map-spawn.xml
index ad7b5b8..6e91c73 100644
--- a/data/world800/map-spawn.xml
+++ b/data/world800/map-spawn.xml
@@ -8862,8 +8862,8 @@
-
-
+
+
@@ -9278,6 +9278,7 @@
+
@@ -9335,8 +9336,10 @@
+
+
@@ -9348,6 +9351,9 @@
+
+
+
@@ -9359,6 +9365,9 @@
+
+
+
@@ -9429,6 +9438,9 @@
+
+
+
@@ -9442,6 +9454,9 @@
+
+
+
@@ -9450,6 +9465,9 @@
+
+
+
@@ -10830,7 +10848,7 @@
-
+
@@ -20567,6 +20585,9 @@
+
+
+
@@ -20579,6 +20600,9 @@
+
+
+
@@ -20602,6 +20626,12 @@
+
+
+
+
+
+
@@ -20613,6 +20643,15 @@
+
+
+
+
+
+
+
+
+
@@ -20718,6 +20757,7 @@
+
@@ -20734,6 +20774,9 @@
+
+
+
@@ -20824,6 +20867,7 @@
+
@@ -21314,6 +21358,9 @@
+
+
+
@@ -21323,6 +21370,9 @@
+
+
+
@@ -21339,6 +21389,9 @@
+
+
+
@@ -37259,7 +37312,6 @@
-
@@ -43382,6 +43434,7 @@
+
@@ -43412,6 +43465,9 @@
+
+
+
diff --git a/data/world800/map.otbm b/data/world800/map.otbm
index 74cd95a..73fc3e4 100644
Binary files a/data/world800/map.otbm and b/data/world800/map.otbm differ