From 79bf2cc6069efeab02a8d6b8a5b212ae7f2c8ca2 Mon Sep 17 00:00:00 2001
From: lzwdgc <lzwdgc@gmail.com>
Date: Mon, 16 Nov 2015 00:33:19 +0300
Subject: [PATCH] Update to the latest Data Manager.

---
 CMakeLists.txt                      | 16 ++++++++++------
 src/CMakeLists.txt                  |  6 +++---
 src/mmo_extractor/mmo_extractor.cpp |  6 +++---
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6945906..0930688 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,7 @@
+#
+# A.I.M. Tools
+#
+
 cmake_minimum_required(VERSION 2.8)
 
 set(output_dir ${CMAKE_BINARY_DIR}/bin)
@@ -23,13 +27,13 @@ endif(MSVC)
 add_definitions(-DPOLYGON4_TOOLS=1)
 add_definitions(-DPOLYGON4_STATIC=1)
 
-if (NOT DATABASE_MANAGER_DIR)
-    message(STATUS "DATABASE_MANAGER_DIR variable is not set! Some targets won't be built")
+if (NOT DATA_MANAGER_DIR)
+    message(STATUS "DATA_MANAGER_DIR variable is not set! Some targets won't be built")
 else()
-    add_subdirectory(${DATABASE_MANAGER_DIR} DatabaseManager)
-    include_directories(${DATABASE_MANAGER_DIR}/include)
-    set_target_properties(sqlite3 PROPERTIES FOLDER Extern)
-    set_target_properties(DatabaseManager PROPERTIES FOLDER Extern)
+    set(SOLUTION_FOLDER Extern)
+    add_subdirectory(${DATA_MANAGER_DIR} DataManager)
+    include_directories(${DATA_MANAGER_DIR}/include)
+    include_directories(${DATA_MANAGER_ADDITIONAL_INCLUDES})
 endif()
 
 if (Git_FOUND)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2b6732e..6d133ac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,14 +13,14 @@ file(GLOB script2txt_src "script2txt/*")
 add_executable(script2txt ${script2txt_src})
 
 
-if (DATABASE_MANAGER_DIR)
+if (DATA_MANAGER_DIR)
 file(GLOB mmm_extractor_src "mmm_extractor/*")
 add_executable(mmm_extractor ${mmm_extractor_src})
-target_link_libraries(mmm_extractor DatabaseManager common)
+target_link_libraries(mmm_extractor DataManager common)
 
 file(GLOB mmo_extractor_src "mmo_extractor/*")
 add_executable(mmo_extractor ${mmo_extractor_src})
-target_link_libraries(mmo_extractor DatabaseManager common)
+target_link_libraries(mmo_extractor DataManager common)
 endif()
 
 
diff --git a/src/mmo_extractor/mmo_extractor.cpp b/src/mmo_extractor/mmo_extractor.cpp
index d4c9836..99ca3a0 100644
--- a/src/mmo_extractor/mmo_extractor.cpp
+++ b/src/mmo_extractor/mmo_extractor.cpp
@@ -30,7 +30,7 @@
 #include <objects.h>
 #include "other.h"
 
-#include <Polygon4/Storage.h>
+#include <Polygon4/DataManager/Storage.h>
 
 #include <buffer.h>
 #include <types.h>
@@ -176,7 +176,7 @@ void write_mmo(string db, const storage &s)
                 {
                     auto mb2 = storage->addMapBuilding(storage->maps[map_id].get());
                     mb.setId(mb2->getId());
-                    *mb2.get() = mb;
+                    *mb2.ptr = mb;
                 }
             }
         }
@@ -227,7 +227,7 @@ void write_mmo(string db, const storage &s)
                 {
                     auto mb2 = storage->addMapObject(storage->maps[map_id].get());
                     mb.setId(mb2->getId());
-                    *mb2.get() = mb;
+                    *mb2.ptr = mb;
                 }
             }
         }