zhanshi/mekhanoidy-tools
1
0
Fork 0
mirror of https://github.com/aimrebirth/tools.git synced 2026-04-15 01:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to the latest Data Manager.

Browse source
This commit is contained in:
lzwdgc 2015-11-16 00:33:19 +03:00
parent e1e46a3b75
commit 79bf2cc606
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -1,3 +1,7 @@
#
# A.I.M. Tools
#
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(output_dir ${CMAKE_BINARY_DIR}/bin) set(output_dir ${CMAKE_BINARY_DIR}/bin)
@ -23,13 +27,13 @@ endif(MSVC)
add_definitions(-DPOLYGON4_TOOLS=1) add_definitions(-DPOLYGON4_TOOLS=1)
add_definitions(-DPOLYGON4_STATIC=1) add_definitions(-DPOLYGON4_STATIC=1)
if (NOT DATABASE_MANAGER_DIR) if (NOT DATA_MANAGER_DIR)
message(STATUS "DATABASE_MANAGER_DIR variable is not set! Some targets won't be built") message(STATUS "DATA_MANAGER_DIR variable is not set! Some targets won't be built")
else() else()
add_subdirectory(${DATABASE_MANAGER_DIR} DatabaseManager) set(SOLUTION_FOLDER Extern)
include_directories(${DATABASE_MANAGER_DIR}/include) add_subdirectory(${DATA_MANAGER_DIR} DataManager)
set_target_properties(sqlite3 PROPERTIES FOLDER Extern) include_directories(${DATA_MANAGER_DIR}/include)
set_target_properties(DatabaseManager PROPERTIES FOLDER Extern) include_directories(${DATA_MANAGER_ADDITIONAL_INCLUDES})
endif() endif()
if (Git_FOUND) if (Git_FOUND)

6
src/CMakeLists.txt
View file

@ -13,14 +13,14 @@ file(GLOB script2txt_src "script2txt/*")
add_executable(script2txt ${script2txt_src}) add_executable(script2txt ${script2txt_src})
if (DATABASE_MANAGER_DIR) if (DATA_MANAGER_DIR)
file(GLOB mmm_extractor_src "mmm_extractor/*") file(GLOB mmm_extractor_src "mmm_extractor/*")
add_executable(mmm_extractor ${mmm_extractor_src}) 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/*") file(GLOB mmo_extractor_src "mmo_extractor/*")
add_executable(mmo_extractor ${mmo_extractor_src}) add_executable(mmo_extractor ${mmo_extractor_src})
target_link_libraries(mmo_extractor DatabaseManager common) target_link_libraries(mmo_extractor DataManager common)
endif() endif()

6
src/mmo_extractor/mmo_extractor.cpp
View file

@ -30,7 +30,7 @@
#include <objects.h> #include <objects.h>
#include "other.h" #include "other.h"
#include <Polygon4/Storage.h> #include <Polygon4/DataManager/Storage.h>
#include <buffer.h> #include <buffer.h>
#include <types.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()); auto mb2 = storage->addMapBuilding(storage->maps[map_id].get());
mb.setId(mb2->getId()); 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()); auto mb2 = storage->addMapObject(storage->maps[map_id].get());
mb.setId(mb2->getId()); mb.setId(mb2->getId());
*mb2.get() = mb; *mb2.ptr = mb;
} }
} }
} }