From 303fc8c23626b0ff40d9860e7ede9ac9c42e05e2 Mon Sep 17 00:00:00 2001 From: Mordred Date: Wed, 2 Jan 2019 23:40:34 +0100 Subject: [PATCH] Moved tools to oos build aswell --- CMakeLists.txt | 9 +------ src/tools/CMakeLists.txt | 27 ++++++++++++++++++++ src/tools/discovery_parser/CMakeLists.txt | 14 +++++----- src/tools/event_object_parser/CMakeLists.txt | 11 -------- src/tools/exd_common_gen/CMakeLists.txt | 10 -------- src/tools/exd_struct_gen/CMakeLists.txt | 13 ---------- src/tools/exd_struct_test/CMakeLists.txt | 11 -------- src/tools/mob_parse/CMakeLists.txt | 11 -------- src/tools/pcb_reader/CMakeLists.txt | 11 -------- src/tools/quest_parser/CMakeLists.txt | 19 -------------- src/world/Actor/SpawnGroup.cpp | 8 ++++++ src/world/Actor/SpawnGroup.h | 2 +- src/world/Territory/Zone.cpp | 1 + 13 files changed, 45 insertions(+), 102 deletions(-) create mode 100644 src/tools/CMakeLists.txt create mode 100644 src/world/Actor/SpawnGroup.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index ac5c583e..ab2d0119 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,11 +65,4 @@ add_subdirectory( "src/dbm" ) ############################## # Tools # ############################## -add_subdirectory( "src/tools/exd_common_gen" ) -add_subdirectory( "src/tools/exd_struct_gen" ) -add_subdirectory( "src/tools/exd_struct_test" ) -add_subdirectory( "src/tools/quest_parser" ) -add_subdirectory( "src/tools/discovery_parser" ) -add_subdirectory( "src/tools/mob_parse" ) -add_subdirectory( "src/tools/pcb_reader" ) -add_subdirectory( "src/tools/event_object_parser" ) +add_subdirectory( "src/tools" ) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt new file mode 100644 index 00000000..06af4261 --- /dev/null +++ b/src/tools/CMakeLists.txt @@ -0,0 +1,27 @@ +cmake_policy( SET CMP0014 NEW ) +cmake_minimum_required( VERSION 3.0.2 ) +project( Sapphire ) + +#set( CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin ) +set( EXECUTABLE_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}/tools ) +set( LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}/tools ) + +if( WIN32 ) + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/tools" ) + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/tools" ) + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}/tools" ) + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}/tools" ) + set( VS_DEBUGGER_WORKING_DIRECTORY "${VS_DEBUGGER_WORKING_DIRECTORY}/tools" ) +endif() + +############################## +# Tools # +############################## +add_subdirectory( "exd_common_gen" ) +add_subdirectory( "exd_struct_gen" ) +add_subdirectory( "exd_struct_test" ) +add_subdirectory( "quest_parser" ) +add_subdirectory( "discovery_parser" ) +add_subdirectory( "mob_parse" ) +add_subdirectory( "pcb_reader" ) +add_subdirectory( "event_object_parser" ) diff --git a/src/tools/discovery_parser/CMakeLists.txt b/src/tools/discovery_parser/CMakeLists.txt index 72d3f831..d60766f3 100644 --- a/src/tools/discovery_parser/CMakeLists.txt +++ b/src/tools/discovery_parser/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0015 NEW) project(Tool_discovery_parser) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin/") +#set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin/tools") file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*" @@ -16,12 +16,12 @@ file(GLOB SERVER_SOURCE_FILES #set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/") add_executable(discovery_parser ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) -set_target_properties(discovery_parser PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" -) +#set_target_properties(discovery_parser PROPERTIES +# RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" +# RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" +# RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" +# RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" +#) if (UNIX) target_link_libraries (discovery_parser common xivdat pthread mysqlclient dl z stdc++fs) diff --git a/src/tools/event_object_parser/CMakeLists.txt b/src/tools/event_object_parser/CMakeLists.txt index 153ec3ba..2b18f34e 100644 --- a/src/tools/event_object_parser/CMakeLists.txt +++ b/src/tools/event_object_parser/CMakeLists.txt @@ -2,23 +2,12 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0015 NEW) project(Tool_event_object_parser) -set(SAPPHIRE_BOOST_VER 1.63.0) -set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin/") - - file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") #set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/") add_executable(event_object_parser ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) -set_target_properties(event_object_parser PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" -) if (UNIX) target_link_libraries (event_object_parser common xivdat pthread mysqlclient dl z stdc++fs) diff --git a/src/tools/exd_common_gen/CMakeLists.txt b/src/tools/exd_common_gen/CMakeLists.txt index 44f19de3..5ad726b2 100644 --- a/src/tools/exd_common_gen/CMakeLists.txt +++ b/src/tools/exd_common_gen/CMakeLists.txt @@ -2,21 +2,11 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0015 NEW) project(Tool_ExdCommonGen) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin/") - - file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") add_executable(exd_common_gen ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) -set_target_properties(exd_common_gen PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" -) - if (UNIX) target_link_libraries (exd_common_gen common xivdat pthread mysqlclient dl z stdc++fs) else() diff --git a/src/tools/exd_struct_gen/CMakeLists.txt b/src/tools/exd_struct_gen/CMakeLists.txt index c2a72377..348aa164 100644 --- a/src/tools/exd_struct_gen/CMakeLists.txt +++ b/src/tools/exd_struct_gen/CMakeLists.txt @@ -2,24 +2,11 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0015 NEW) project(Tool_ExdStructGen) -set(SAPPHIRE_BOOST_VER 1.63.0) -set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin/") - - file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") -#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/") add_executable(exd_struct_gen ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) -set_target_properties(exd_struct_gen PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" -) - if (UNIX) target_link_libraries (exd_struct_gen common xivdat pthread mysqlclient dl z stdc++fs) else() diff --git a/src/tools/exd_struct_test/CMakeLists.txt b/src/tools/exd_struct_test/CMakeLists.txt index 0f05b4e3..8ebb7bba 100644 --- a/src/tools/exd_struct_test/CMakeLists.txt +++ b/src/tools/exd_struct_test/CMakeLists.txt @@ -2,22 +2,11 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0015 NEW) project(Tool_ExdStructTest) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin/") - - file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") -#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/") add_executable(exd_struct_test ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) -set_target_properties(exd_struct_test PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" -) - if (UNIX) target_link_libraries (exd_struct_test common xivdat pthread mysqlclient dl z stdc++fs ) else() diff --git a/src/tools/mob_parse/CMakeLists.txt b/src/tools/mob_parse/CMakeLists.txt index db59308f..cbae9ce3 100644 --- a/src/tools/mob_parse/CMakeLists.txt +++ b/src/tools/mob_parse/CMakeLists.txt @@ -2,22 +2,11 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0015 NEW) project(Tool_mob_parse) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin/") - - file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") -#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/") add_executable(mob_parse ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) -set_target_properties(mob_parse PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" -) - if (UNIX) target_link_libraries (mob_parse common xivdat pthread mysqlclient dl z stdc++fs ) else() diff --git a/src/tools/pcb_reader/CMakeLists.txt b/src/tools/pcb_reader/CMakeLists.txt index 46eccf0f..0a51293b 100644 --- a/src/tools/pcb_reader/CMakeLists.txt +++ b/src/tools/pcb_reader/CMakeLists.txt @@ -2,22 +2,11 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0015 NEW) project(Tool_pcb_reader2) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin/") - - file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") -#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/") add_executable(pcb_reader2 ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) -set_target_properties(pcb_reader2 PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" -) - if (UNIX) target_link_libraries (pcb_reader2 common xivdat pthread mysqlclient dl z stdc++fs ) else() diff --git a/src/tools/quest_parser/CMakeLists.txt b/src/tools/quest_parser/CMakeLists.txt index ccd4098f..252cee64 100644 --- a/src/tools/quest_parser/CMakeLists.txt +++ b/src/tools/quest_parser/CMakeLists.txt @@ -2,30 +2,11 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0015 NEW) project(Tool_QuestParser) -set(SAPPHIRE_BOOST_VER 1.63.0) -set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin/") - -include_directories("../../lib/ChaiScript-6.0.0/include/") - -include_directories("../../sapphire/datReader/") -include_directories("../../sapphire/") -include_directories("../") - file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") - -#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/") add_executable(quest_parse ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) -set_target_properties(quest_parse PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" -) - if (UNIX) target_link_libraries (quest_parse common xivdat pthread mysqlclient dl z stdc++fs) else() diff --git a/src/world/Actor/SpawnGroup.cpp b/src/world/Actor/SpawnGroup.cpp new file mode 100644 index 00000000..a98a4b0d --- /dev/null +++ b/src/world/Actor/SpawnGroup.cpp @@ -0,0 +1,8 @@ +#include "ForwardsZone.h" +#include "SpawnGroup.h" + +Sapphire::Entity::SpawnGroup::SpawnGroup( uint32_t bNpcTemplateId, uint32_t level ) : + m_level( level ) +{ + +} diff --git a/src/world/Actor/SpawnGroup.h b/src/world/Actor/SpawnGroup.h index 5f5fb95a..16739ac2 100644 --- a/src/world/Actor/SpawnGroup.h +++ b/src/world/Actor/SpawnGroup.h @@ -17,7 +17,7 @@ namespace Sapphire::Entity std::vector< SpawnPointPtr > m_spawnPoints; public: - SpawnGroup(); + SpawnGroup( uint32_t bNpcTemplateId, uint32_t level ); }; diff --git a/src/world/Territory/Zone.cpp b/src/world/Territory/Zone.cpp index cae7a403..1c782dc7 100644 --- a/src/world/Territory/Zone.cpp +++ b/src/world/Territory/Zone.cpp @@ -76,6 +76,7 @@ Sapphire::Zone::Zone( uint16_t territoryTypeId, uint32_t guId, m_territoryTypeInfo = pExdData->get< Sapphire::Data::TerritoryType >( territoryTypeId ); loadWeatherRates(); + loadSpawnGroups(); m_currentWeather = getNextWeather(); }