diff --git a/.gitignore b/.gitignore index f057cbaf..456609e8 100644 --- a/.gitignore +++ b/.gitignore @@ -104,7 +104,7 @@ src/libraries/external/boost_* *.idb # sapphire version -src/servers/Server_Common/Version\.cpp +src/common/Version\.cpp # edit and continue files /enc_temp_folder diff --git a/CMakeLists.txt b/CMakeLists.txt index 54f7d380..8fe6f474 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0) ########################################################################## # Common and library path -set(SERVER_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/servers/Server_Common") +set(SERVER_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/common") set(LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries") ########################################################################## @@ -37,9 +37,9 @@ include( "cmake/compiler.cmake" ) ############################## include(GetGitRevisionDescription) get_git_head_revision(GIT_REFSPEC GIT_SHA1) -git_describe(VERSION --tags --dirty=-d) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/servers/Server_Common/Version.cpp.in" - "${CMAKE_CURRENT_SOURCE_DIR}/src/servers/Server_Common/Version.cpp" @ONLY) +git_describe(VERSION --all --dirty=-d) +configure_file("${SERVER_COMMON_DIR}/Version.cpp.in" + "${SERVER_COMMON_DIR}/Version.cpp" @ONLY) ########################################################################## # Common include folders @@ -61,10 +61,12 @@ add_subdirectory("src/servers") add_subdirectory("src/libraries/sapphire/datReader") add_subdirectory("src/libraries/sapphire/mysqlConnector") +add_subdirectory("src/common") + 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/pcb_reader") +#add_subdirectory("src/tools/pcb_reader") add_subdirectory("scripts/native") diff --git a/scripts/native/CMakeLists.txt b/scripts/native/CMakeLists.txt index b7b5de1e..c09d37a8 100644 --- a/scripts/native/CMakeLists.txt +++ b/scripts/native/CMakeLists.txt @@ -5,10 +5,11 @@ file(GLOB SCRIPT_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h") file(GLOB_RECURSE SCRIPT_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp") include_directories("${CMAKE_SOURCE_DIR}/src/servers/") -include_directories("${CMAKE_SOURCE_DIR}/src/servers/Server_Zone/") +include_directories("${CMAKE_SOURCE_DIR}/src/servers/sapphire_zone/") +include_directories("${CMAKE_CURRENT_SOURCE_DIR}") if(MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Yc${CMAKE_CURRENT_SOURCE_DIR}/ScriptObject.h /FI${CMAKE_CURRENT_SOURCE_DIR}/ScriptObject.h") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Yc\"${CMAKE_CURRENT_SOURCE_DIR}/ScriptObject.h\" /FI\"${CMAKE_CURRENT_SOURCE_DIR}/ScriptObject.h\"") endif() message( "exec: ${EXECUTABLE_OUTPUT_DIRECTORY}" ) @@ -37,11 +38,11 @@ foreach(_sourcefile ${SCRIPT_FILES}) ) endif() - target_link_libraries("${_file}" server_zone) + target_link_libraries("${_file}" sapphire_zone) add_custom_command(TARGET "${_file}" POST_BUILD COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/${_file}.exp" COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/${_file}.lib" COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/${_file}.ilk" ) -endforeach(_sourcefile ${SCRIPT_FILES}) \ No newline at end of file +endforeach(_sourcefile ${SCRIPT_FILES}) diff --git a/scripts/native/quest/ManFst004.cpp b/scripts/native/quest/ManFst004.cpp new file mode 100644 index 00000000..874fd650 --- /dev/null +++ b/scripts/native/quest/ManFst004.cpp @@ -0,0 +1,259 @@ +// This is an automatically generated C++ script template +// Content needs to be added by hand to make it function +// In order for this script to be loaded, change its extension to .cpp +// and move it to the correct folder in /scripts/native/ + +#include + +// Quest Script: ManFst004_00124 +// Quest Name: Close to Home +// Quest ID: 65660 +// Start NPC: 1001140 +// End NPC: 1000100 + +class ManFst004 : public EventScript +{ + private: + // Basic quest information + // Quest vars / flags used + // GetQuestBitFlag8 + // GetQuestUI8AL + // GetQuestUI8BH + // GetQuestUI8BL + // GetQuestUI8CH + + // Steps in this quest ( 0 is before accepting, + // 1 is first, 255 means ready for turning it in + enum Sequence : uint8_t + { + Seq0 = 0, + Seq1 = 1, + SeqFinish = 255, + }; + + // Quest rewards + static constexpr auto RewardExpFactor = 100; + static constexpr auto RewardGil = 107; + + // Entities found in the script data of the quest + static constexpr auto Actor0 = 1001140; + static constexpr auto Actor1 = 2; + static constexpr auto Actor2 = 1000323; + static constexpr auto Actor20 = 1000159; + static constexpr auto Actor3 = 1000768; + static constexpr auto Actor4 = 1000100; + static constexpr auto BindActor0 = 6229224; + static constexpr auto Item0 = 2000120; + static constexpr auto LocActor0 = 1003159; + static constexpr auto LocMarker01 = 2153091; + static constexpr auto LocMarker02 = 2153104; + static constexpr auto LocMarker03 = 2153111; + static constexpr auto LocMarker04 = 2154539; + static constexpr auto LocMarker05 = 2154540; + static constexpr auto LocMarker06 = 2154541; + static constexpr auto LocMarker07 = 2210446; + static constexpr auto LocMarker08 = 2210454; + static constexpr auto LocMarker09 = 2210461; + static constexpr auto LocMotion0 = 799; + static constexpr auto Poprange0 = 2280858; + static constexpr auto RewardDesion = 1; + static constexpr auto Seq0Actor0 = 0; + static constexpr auto Seq0Actor0Lq = 50; + static constexpr auto Seq1Actor0 = 4; + static constexpr auto Seq1Actor1 = 1; + static constexpr auto Seq1Actor1Wait = 51; + static constexpr auto Seq1Actor2 = 2; + static constexpr auto Seq1Actor3 = 3; + static constexpr auto Seq1Actor3Npctradeno = 99; + static constexpr auto Seq1Actor3Npctradeok = 100; + static constexpr auto Seq2Actor4 = 5; + static constexpr auto Territorytype0 = 132; + static constexpr auto UnlockDesion = 14; + + public: + ManFst004() : EventScript( "Close to Home", 65660 ){}; + ~ManFst004(){}; + + ////////////////////////////////////////////////////////////////////// + // Event Handlers + void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override + { + auto actor = Event::mapEventActorToRealActor( actorId ); + if( actor == ManFst004::Actor0 ) + { + Scene00000( player ); + } + else if( actor == ManFst004::Actor1 ) + { + // starting the Aetheryte eventaction + // player.eventStart( actorId, 0x050002, 7, 0, 0); + // starting the eventaction 0x13 ( attuning ) + player.eventActionStart( 0x050002, 0x13, + [&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) + { + player.sendQuestMessage( 0x050002, 0, 1, 0, 0 ); + player.registerAetheryte( 2 ); + player.learnAction( 1 ); + Scene00051( player ); + }, + [&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) {}, + eventId ); + } + else if( actor == ManFst004::Actor2 ) + { + Scene00002( player ); + } + else if( actor == ManFst004::Actor3 ) + { + Scene00003( player ); + } + else if( actor == ManFst004::Actor4 ) + { + Scene00005( player ); + } + } + + private: + + void checkQuestCompletion( Entity::Player& player, uint32_t varIdx ) + { + if( varIdx == 3 ) + { + player.sendQuestMessage( m_id, 1, 0, 0, 0 ); + } + else if( varIdx == 2 ) + { + player.sendQuestMessage( m_id, 2, 0, 0, 0 ); + } + else + { + player.sendQuestMessage( m_id, 0, 0, 0, 0 ); + } + + auto questId = m_id; + + auto QUEST_VAR_ATTUNE = player.getQuestUI8AL( questId ); + auto QUEST_VAR_CLASS = player.getQuestUI8BH( questId ); + auto QUEST_VAR_TRADE = player.getQuestUI8BL( questId ); + + if( QUEST_VAR_ATTUNE == 1 && QUEST_VAR_CLASS == 1 && QUEST_VAR_TRADE == 1 ) + { + player.updateQuest( questId, SeqFinish ); + } + } + ////////////////////////////////////////////////////////////////////// + // Available Scenes in this quest, not necessarly all are used + void Scene00000( Entity::Player& player ) + { + player.eventPlay( m_id, 0, 0x2000, + [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) + { + if( param2 == 1 ) // accept quest + { + Scene00050( player ); + } + }); + } + + void Scene00001( Entity::Player& player ) + { + player.eventPlay( m_id, 1, 0, + [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) + { + player.setQuestUI8AL( m_id, 1 ); + checkQuestCompletion( player, 0 ); + }); + } + + void Scene00002( Entity::Player& player ) + { + player.eventPlay( m_id, 2, 0, + [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) + { + player.setQuestUI8BH( m_id, 1 ); + checkQuestCompletion( player, 3 ); + }); + } + + void Scene00003( Entity::Player& player ) + { + player.eventPlay( m_id, 3, 0, + [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) + { + if( param2 == 1 ) + { + Scene00100( player ); + } + else + { + Scene00099( player ); + } + }); + } + + void Scene00004( Entity::Player& player ) + { + player.eventPlay( m_id, 4, 0, 0, 0 ); + } + + void Scene00005( Entity::Player& player ) + { + player.eventPlay( m_id, 5, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, + [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) + { + if( param2 == 1 ) // finish quest + { + if( player.giveQuestRewards( m_id, 0 ) ) + { + player.finishQuest( m_id ); + } + } + }); + } + + void Scene00050( Entity::Player& player ) + { + player.eventPlay( m_id, 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0/*unk*/, 0/*unk*/, + [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) + { + // accepting quest "close to home" + player.updateQuest( m_id, 1 ); + player.setQuestUI8CH( m_id, 1 ); // receive key item + // event is done, need to teleport to real zone. + player.setZone( 132 ); + //player.setZone(183); back to starting griania for debug purpose + }); + } + + void Scene00051( Entity::Player& player ) + { + player.eventPlay( m_id, 51, 0, + [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) + { + Scene00001( player ); + }); + } + + void Scene00099( Entity::Player& player ) + { + player.eventPlay( m_id, 99, 0, + [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) + { + Scene00004( player ); + }); + } + + void Scene00100( Entity::Player& player ) + { + player.eventPlay( m_id, 100, 0, + [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) + { + player.setQuestUI8CH( m_id, 0 ); // remove key item, since we have just traded it + player.setQuestUI8BL( m_id, 1 ); + checkQuestCompletion( player, 2 ); + }); + } + +}; + +EXPORT_SCRIPTOBJECT( ManFst004 ); \ No newline at end of file diff --git a/src/servers/Server_Common/CMakeLists.txt b/src/common/CMakeLists.txt similarity index 65% rename from src/servers/Server_Common/CMakeLists.txt rename to src/common/CMakeLists.txt index b84654fb..7d9fd527 100644 --- a/src/servers/Server_Common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,9 +1,13 @@ cmake_minimum_required(VERSION 2.6) project(Sapphire) -file(GLOB UTILS_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") +include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) + +file(GLOB UTILS_PUBLIC_INCLUDE_FILES + "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/*.h") file(GLOB UTILS_SOURCE_FILES - "${CMAKE_CURRENT_SOURCE_DIR}*.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Config/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Crypt/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Database/*.cpp" @@ -13,23 +17,24 @@ file(GLOB UTILS_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/Network/PacketDef/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Script/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Util/*.cpp") + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -add_library(Common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES}) +add_library(common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES}) -set_target_properties(Common PROPERTIES +set_target_properties(common PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS ON - 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/" + 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( Common xivdat mysqlclient mysqlConnector ) + target_link_libraries( common xivdat mysqlclient mysqlConnector ) else() - target_link_libraries( Common xivdat mysqlConnector libmysql ) + target_link_libraries( common xivdat mysqlConnector libmysql ) endif() diff --git a/src/servers/Server_Common/Common.h b/src/common/Common.h similarity index 99% rename from src/servers/Server_Common/Common.h rename to src/common/Common.h index e16f5035..634c1828 100644 --- a/src/servers/Server_Common/Common.h +++ b/src/common/Common.h @@ -1,7 +1,6 @@ #ifndef _COMMON_H #define _COMMON_H -#include #include #include diff --git a/src/servers/Server_Common/CommonGen.cpp b/src/common/CommonGen.cpp similarity index 100% rename from src/servers/Server_Common/CommonGen.cpp rename to src/common/CommonGen.cpp diff --git a/src/servers/Server_Common/CommonGen.h b/src/common/CommonGen.h similarity index 100% rename from src/servers/Server_Common/CommonGen.h rename to src/common/CommonGen.h diff --git a/src/servers/Server_Common/Config/XMLConfig.cpp b/src/common/Config/XMLConfig.cpp similarity index 100% rename from src/servers/Server_Common/Config/XMLConfig.cpp rename to src/common/Config/XMLConfig.cpp diff --git a/src/servers/Server_Common/Config/XMLConfig.h b/src/common/Config/XMLConfig.h similarity index 100% rename from src/servers/Server_Common/Config/XMLConfig.h rename to src/common/Config/XMLConfig.h diff --git a/src/servers/Server_Common/Crypt/base64.cpp b/src/common/Crypt/base64.cpp similarity index 100% rename from src/servers/Server_Common/Crypt/base64.cpp rename to src/common/Crypt/base64.cpp diff --git a/src/servers/Server_Common/Crypt/base64.h b/src/common/Crypt/base64.h similarity index 100% rename from src/servers/Server_Common/Crypt/base64.h rename to src/common/Crypt/base64.h diff --git a/src/servers/Server_Common/Crypt/blowfish.cpp b/src/common/Crypt/blowfish.cpp similarity index 100% rename from src/servers/Server_Common/Crypt/blowfish.cpp rename to src/common/Crypt/blowfish.cpp diff --git a/src/servers/Server_Common/Crypt/blowfish.h b/src/common/Crypt/blowfish.h similarity index 95% rename from src/servers/Server_Common/Crypt/blowfish.h rename to src/common/Crypt/blowfish.h index 8c13144a..81562b33 100644 --- a/src/servers/Server_Common/Crypt/blowfish.h +++ b/src/common/Crypt/blowfish.h @@ -1,3 +1,5 @@ +#ifndef _BLOWFISH_H +#define _BLOWFISH_H // blowfish.h interface file for blowfish.cpp // _THE BLOWFISH ENCRYPTION ALGORITHM_ // by Bruce Schneier @@ -7,7 +9,7 @@ #define MAXKEYBYTES 56 // 448 bits max #define NPASS 16 // SBox passes -#define DWORD uint32_t +#define DWORD uint32_t #define WORD unsigned short #define BYTE uint8_t @@ -70,3 +72,4 @@ public: } w; }; #endif +#endif \ No newline at end of file diff --git a/src/servers/Server_Common/Crypt/blowfish.h2 b/src/common/Crypt/blowfish.h2 similarity index 100% rename from src/servers/Server_Common/Crypt/blowfish.h2 rename to src/common/Crypt/blowfish.h2 diff --git a/src/servers/Server_Common/Crypt/md5.cpp b/src/common/Crypt/md5.cpp similarity index 100% rename from src/servers/Server_Common/Crypt/md5.cpp rename to src/common/Crypt/md5.cpp diff --git a/src/servers/Server_Common/Crypt/md5.h b/src/common/Crypt/md5.h similarity index 99% rename from src/servers/Server_Common/Crypt/md5.h rename to src/common/Crypt/md5.h index e10bef53..eada75ed 100644 --- a/src/servers/Server_Common/Crypt/md5.h +++ b/src/common/Crypt/md5.h @@ -1,7 +1,6 @@ -#include - #ifndef _MD52_H #define _MD52_H +#include namespace Core { diff --git a/src/servers/Server_Common/Database/CharaDbConnection.cpp b/src/common/Database/CharaDbConnection.cpp similarity index 100% rename from src/servers/Server_Common/Database/CharaDbConnection.cpp rename to src/common/Database/CharaDbConnection.cpp diff --git a/src/servers/Server_Common/Database/CharaDbConnection.h b/src/common/Database/CharaDbConnection.h similarity index 100% rename from src/servers/Server_Common/Database/CharaDbConnection.h rename to src/common/Database/CharaDbConnection.h diff --git a/src/common/Database/DatabaseDef.h b/src/common/Database/DatabaseDef.h new file mode 100644 index 00000000..8fc3f2d9 --- /dev/null +++ b/src/common/Database/DatabaseDef.h @@ -0,0 +1,12 @@ +#ifndef _DATABASEDEF_H +#define _DATABASEDEF_H + +#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" +#include +#include +#include +#include + +extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; + +#endif diff --git a/src/servers/Server_Common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp similarity index 98% rename from src/servers/Server_Common/Database/DbConnection.cpp rename to src/common/Database/DbConnection.cpp index fdb9533f..b0633492 100644 --- a/src/servers/Server_Common/Database/DbConnection.cpp +++ b/src/common/Database/DbConnection.cpp @@ -2,7 +2,7 @@ #include "DbWorker.h" #include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" -#include "src/servers/Server_Common/Logging/Logger.h" +#include #include "PreparedStatement.h" #include diff --git a/src/servers/Server_Common/Database/DbConnection.h b/src/common/Database/DbConnection.h similarity index 96% rename from src/servers/Server_Common/Database/DbConnection.h rename to src/common/Database/DbConnection.h index 237ed9f3..ddb66e17 100644 --- a/src/servers/Server_Common/Database/DbConnection.h +++ b/src/common/Database/DbConnection.h @@ -6,8 +6,7 @@ #include #include #include -#include "src/servers/Server_Common/Util/LockedWaitQueue.h" -#include +#include #include #include diff --git a/src/servers/Server_Common/Database/DbLoader.cpp b/src/common/Database/DbLoader.cpp similarity index 98% rename from src/servers/Server_Common/Database/DbLoader.cpp rename to src/common/Database/DbLoader.cpp index 5e537856..c74d30b2 100644 --- a/src/servers/Server_Common/Database/DbLoader.cpp +++ b/src/common/Database/DbLoader.cpp @@ -2,7 +2,7 @@ #include #include "CharaDbConnection.h" #include "DbWorkerPool.h" -#include "src/servers/Server_Common/Logging/Logger.h" +#include extern Core::Logger g_log; diff --git a/src/servers/Server_Common/Database/DbLoader.h b/src/common/Database/DbLoader.h similarity index 100% rename from src/servers/Server_Common/Database/DbLoader.h rename to src/common/Database/DbLoader.h diff --git a/src/servers/Server_Common/Database/DbWorker.cpp b/src/common/Database/DbWorker.cpp similarity index 94% rename from src/servers/Server_Common/Database/DbWorker.cpp rename to src/common/Database/DbWorker.cpp index 9c1f5c8b..a242eb04 100644 --- a/src/servers/Server_Common/Database/DbWorker.cpp +++ b/src/common/Database/DbWorker.cpp @@ -1,6 +1,6 @@ #include "DbWorker.h" #include "Operation.h" -#include +#include Core::Db::DbWorker::DbWorker( Core::LockedWaitQueue< boost::shared_ptr< Operation > >* newQueue, DbConnection* pConn ) { diff --git a/src/servers/Server_Common/Database/DbWorker.h b/src/common/Database/DbWorker.h similarity index 93% rename from src/servers/Server_Common/Database/DbWorker.h rename to src/common/Database/DbWorker.h index 679b1522..cfadb795 100644 --- a/src/servers/Server_Common/Database/DbWorker.h +++ b/src/common/Database/DbWorker.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include namespace Core diff --git a/src/servers/Server_Common/Database/DbWorkerPool.cpp b/src/common/Database/DbWorkerPool.cpp similarity index 99% rename from src/servers/Server_Common/Database/DbWorkerPool.cpp rename to src/common/Database/DbWorkerPool.cpp index 575bf457..ceb44110 100644 --- a/src/servers/Server_Common/Database/DbWorkerPool.cpp +++ b/src/common/Database/DbWorkerPool.cpp @@ -7,7 +7,7 @@ #include "CharaDbConnection.h" #include -#include +#include extern Core::Logger g_log; class PingOperation : public Core::Db::Operation @@ -273,4 +273,4 @@ void DatabaseWorkerPool::ExecuteOrAppend(SQLTransaction& trans, PreparedState } */ -template class Core::Db::DbWorkerPool< Core::Db::CharaDbConnection >; \ No newline at end of file +template class Core::Db::DbWorkerPool< Core::Db::CharaDbConnection >; diff --git a/src/servers/Server_Common/Database/DbWorkerPool.h b/src/common/Database/DbWorkerPool.h similarity index 97% rename from src/servers/Server_Common/Database/DbWorkerPool.h rename to src/common/Database/DbWorkerPool.h index 6b364171..a16a5b28 100644 --- a/src/servers/Server_Common/Database/DbWorkerPool.h +++ b/src/common/Database/DbWorkerPool.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "DbConnection.h" namespace Core { diff --git a/src/servers/Server_Common/Database/Operation.h b/src/common/Database/Operation.h similarity index 100% rename from src/servers/Server_Common/Database/Operation.h rename to src/common/Database/Operation.h diff --git a/src/servers/Server_Common/Database/PreparedStatement.cpp b/src/common/Database/PreparedStatement.cpp similarity index 100% rename from src/servers/Server_Common/Database/PreparedStatement.cpp rename to src/common/Database/PreparedStatement.cpp diff --git a/src/servers/Server_Common/Database/PreparedStatement.h b/src/common/Database/PreparedStatement.h similarity index 100% rename from src/servers/Server_Common/Database/PreparedStatement.h rename to src/common/Database/PreparedStatement.h diff --git a/src/servers/Server_Common/Database/StatementTask.cpp b/src/common/Database/StatementTask.cpp similarity index 100% rename from src/servers/Server_Common/Database/StatementTask.cpp rename to src/common/Database/StatementTask.cpp diff --git a/src/servers/Server_Common/Database/StatementTask.h b/src/common/Database/StatementTask.h similarity index 100% rename from src/servers/Server_Common/Database/StatementTask.h rename to src/common/Database/StatementTask.h diff --git a/src/servers/Server_Common/Exd/ExdData.cpp b/src/common/Exd/ExdData.cpp similarity index 100% rename from src/servers/Server_Common/Exd/ExdData.cpp rename to src/common/Exd/ExdData.cpp diff --git a/src/servers/Server_Common/Exd/ExdData.h b/src/common/Exd/ExdData.h similarity index 100% rename from src/servers/Server_Common/Exd/ExdData.h rename to src/common/Exd/ExdData.h diff --git a/src/servers/Server_Common/Forwards.h b/src/common/Forwards.h similarity index 100% rename from src/servers/Server_Common/Forwards.h rename to src/common/Forwards.h diff --git a/src/servers/Server_Common/Logging/Logger.cpp b/src/common/Logging/Logger.cpp similarity index 100% rename from src/servers/Server_Common/Logging/Logger.cpp rename to src/common/Logging/Logger.cpp diff --git a/src/servers/Server_Common/Logging/Logger.h b/src/common/Logging/Logger.h similarity index 100% rename from src/servers/Server_Common/Logging/Logger.h rename to src/common/Logging/Logger.h diff --git a/src/servers/Server_Common/Network/Acceptor.cpp b/src/common/Network/Acceptor.cpp similarity index 96% rename from src/servers/Server_Common/Network/Acceptor.cpp rename to src/common/Network/Acceptor.cpp index 0d89bad4..f86bb7a3 100644 --- a/src/servers/Server_Common/Network/Acceptor.cpp +++ b/src/common/Network/Acceptor.cpp @@ -1,6 +1,6 @@ -#include "src/servers/Server_Common/Network/Hive.h" +#include #include "Acceptor.h" -#include "src/servers/Server_Common/Network/Connection.h" +#include #include #include @@ -127,4 +127,4 @@ namespace Core } } -} \ No newline at end of file +} diff --git a/src/servers/Server_Common/Network/Acceptor.h b/src/common/Network/Acceptor.h similarity index 97% rename from src/servers/Server_Common/Network/Acceptor.h rename to src/common/Network/Acceptor.h index e7b69880..191184e8 100644 --- a/src/servers/Server_Common/Network/Acceptor.h +++ b/src/common/Network/Acceptor.h @@ -5,7 +5,7 @@ #include #include #include -#include "src/servers/Server_Common/Forwards.h" +#include namespace Core { @@ -75,4 +75,4 @@ namespace Core } } -#endif \ No newline at end of file +#endif diff --git a/src/servers/Server_Common/Network/CommonNetwork.h b/src/common/Network/CommonNetwork.h similarity index 100% rename from src/servers/Server_Common/Network/CommonNetwork.h rename to src/common/Network/CommonNetwork.h diff --git a/src/servers/Server_Common/Network/Connection.cpp b/src/common/Network/Connection.cpp similarity index 100% rename from src/servers/Server_Common/Network/Connection.cpp rename to src/common/Network/Connection.cpp diff --git a/src/servers/Server_Common/Network/Connection.h b/src/common/Network/Connection.h similarity index 98% rename from src/servers/Server_Common/Network/Connection.h rename to src/common/Network/Connection.h index 194aea5a..40dd66fe 100644 --- a/src/servers/Server_Common/Network/Connection.h +++ b/src/common/Network/Connection.h @@ -9,7 +9,7 @@ #include #include -#include "src/servers/Server_Common/Forwards.h" +#include #include "Acceptor.h" @@ -141,4 +141,4 @@ namespace Core { } -#endif \ No newline at end of file +#endif diff --git a/src/servers/Server_Common/Network/GamePacket.cpp b/src/common/Network/GamePacket.cpp similarity index 98% rename from src/servers/Server_Common/Network/GamePacket.cpp rename to src/common/Network/GamePacket.cpp index c67f4fb6..10564229 100644 --- a/src/servers/Server_Common/Network/GamePacket.cpp +++ b/src/common/Network/GamePacket.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "Server_Common/Util/Util.h" +#include Core::Network::Packets::GamePacket::GamePacket( uint16_t subType, uint16_t size, uint32_t id1, uint32_t id2, uint16_t type ) { diff --git a/src/servers/Server_Common/Network/GamePacket.h b/src/common/Network/GamePacket.h similarity index 97% rename from src/servers/Server_Common/Network/GamePacket.h rename to src/common/Network/GamePacket.h index 6fcc584e..08e7b992 100644 --- a/src/servers/Server_Common/Network/GamePacket.h +++ b/src/common/Network/GamePacket.h @@ -2,7 +2,7 @@ #define _GAMEPACKET_H_ #include "CommonNetwork.h" -#include "src/servers/Server_Common/Forwards.h" +#include #include #include diff --git a/src/servers/Server_Common/Network/GamePacketNew.h b/src/common/Network/GamePacketNew.h similarity index 100% rename from src/servers/Server_Common/Network/GamePacketNew.h rename to src/common/Network/GamePacketNew.h diff --git a/src/servers/Server_Common/Network/GamePacketParser.cpp b/src/common/Network/GamePacketParser.cpp similarity index 100% rename from src/servers/Server_Common/Network/GamePacketParser.cpp rename to src/common/Network/GamePacketParser.cpp diff --git a/src/servers/Server_Common/Network/GamePacketParser.h b/src/common/Network/GamePacketParser.h similarity index 100% rename from src/servers/Server_Common/Network/GamePacketParser.h rename to src/common/Network/GamePacketParser.h diff --git a/src/servers/Server_Common/Network/Hive.cpp b/src/common/Network/Hive.cpp similarity index 100% rename from src/servers/Server_Common/Network/Hive.cpp rename to src/common/Network/Hive.cpp diff --git a/src/servers/Server_Common/Network/Hive.h b/src/common/Network/Hive.h similarity index 100% rename from src/servers/Server_Common/Network/Hive.h rename to src/common/Network/Hive.h diff --git a/src/servers/Server_Common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp similarity index 97% rename from src/servers/Server_Common/Network/PacketContainer.cpp rename to src/common/Network/PacketContainer.cpp index 906d3de4..efe6235c 100644 --- a/src/servers/Server_Common/Network/PacketContainer.cpp +++ b/src/common/Network/PacketContainer.cpp @@ -1,6 +1,6 @@ #include "PacketContainer.h" #include "GamePacket.h" -#include "src/servers/Server_Common/Common.h" +#include #include diff --git a/src/servers/Server_Common/Network/PacketContainer.h b/src/common/Network/PacketContainer.h similarity index 91% rename from src/servers/Server_Common/Network/PacketContainer.h rename to src/common/Network/PacketContainer.h index 8bab92a4..9f39de72 100644 --- a/src/servers/Server_Common/Network/PacketContainer.h +++ b/src/common/Network/PacketContainer.h @@ -3,7 +3,7 @@ #include -#include "src/servers/Server_Common/Common.h" +#include #include "CommonNetwork.h" #include "GamePacket.h" diff --git a/src/servers/Server_Common/Network/PacketDef/Chat/ServerChatDef.h b/src/common/Network/PacketDef/Chat/ServerChatDef.h similarity index 88% rename from src/servers/Server_Common/Network/PacketDef/Chat/ServerChatDef.h rename to src/common/Network/PacketDef/Chat/ServerChatDef.h index 219b3706..843cf289 100644 --- a/src/servers/Server_Common/Network/PacketDef/Chat/ServerChatDef.h +++ b/src/common/Network/PacketDef/Chat/ServerChatDef.h @@ -1,8 +1,8 @@ #ifndef _CORE_NETWORK_PACKETS_CHAT_SERVER_IPC_H #define _CORE_NETWORK_PACKETS_CHAT_SERVER_IPC_H -#include "src/servers/Server_Common/Common.h" -#include "src/servers/Server_Common/Network/CommonNetwork.h" +#include +#include namespace Core { namespace Network { diff --git a/src/servers/Server_Common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h similarity index 99% rename from src/servers/Server_Common/Network/PacketDef/Ipcs.h rename to src/common/Network/PacketDef/Ipcs.h index 587bb96d..62dc2139 100644 --- a/src/servers/Server_Common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -107,7 +107,7 @@ namespace Packets { EventLinkshell = 0x1169, - QuestMessage = 0x0179, + QuestMessage = 0x0188, // updated 4.1 QuestActiveList = 0x017D, // updated 4.1 QuestUpdate = 0x017E, // updated 4.1 QuestCompleteList = 0x017F, // updated 4.1 diff --git a/src/servers/Server_Common/Network/PacketDef/Lobby/ServerLobbyDef.h b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h similarity index 96% rename from src/servers/Server_Common/Network/PacketDef/Lobby/ServerLobbyDef.h rename to src/common/Network/PacketDef/Lobby/ServerLobbyDef.h index 2d0fe4d0..cf971bef 100644 --- a/src/servers/Server_Common/Network/PacketDef/Lobby/ServerLobbyDef.h +++ b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h @@ -1,8 +1,8 @@ #ifndef _CORE_NETWORK_PACKETS_LOBBY_SERVER_IPC_H #define _CORE_NETWORK_PACKETS_LOBBY_SERVER_IPC_H -#include "src/servers/Server_Common/Common.h" -#include "src/servers/Server_Common/Network/CommonNetwork.h" +#include +#include namespace Core { namespace Network { @@ -140,4 +140,4 @@ struct FFXIVIpcLobbyError : FFXIVIpcBasePacket } } } -#endif \ No newline at end of file +#endif diff --git a/src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h similarity index 93% rename from src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h rename to src/common/Network/PacketDef/Zone/ServerZoneDef.h index d70120b7..53a5c50d 100644 --- a/src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -7,8 +7,8 @@ #ifndef _CORE_NETWORK_PACKETS_ZONE_SERVER_IPC_H #define _CORE_NETWORK_PACKETS_ZONE_SERVER_IPC_H -#include "src/servers/Server_Common/Common.h" -#include "src/servers/Server_Common/Network/CommonNetwork.h" +#include +#include namespace Core { namespace Network { @@ -486,71 +486,6 @@ struct FFXIVIpcNpcSpawn : FFXIVIpcBasePacket uint32_t unk30; }; -struct FFXIVIpcActorSpawn : FFXIVIpcBasePacket -{ - uint32_t unknown_0; - uint32_t nameId; - uint32_t bnpcBaseId; - uint32_t unknown_C[2]; - uint32_t ownerId; - uint32_t unknown_E[2]; - uint64_t targetId; - uint32_t fateId; - uint8_t gmRank; - uint8_t spawnIndex; - uint8_t status; /** 1 = alive, 2 = dead, 3 = use pose*/ - uint8_t pose; /** sitting, dancing, etc */ - uint8_t mobAgressive; /** 0 passive, 2 agressive */ - uint8_t mobTypeIcon; /** normal, nm, etc */ - uint8_t type; /** 0 = nothing, 1 = player, 2 = npc*/ - uint8_t unknown_33; - uint32_t unknown_34; - uint8_t voice; - uint8_t scale; - uint8_t v1; - uint8_t v2; - uint32_t unknown_38_1; - int32_t unknown_89; - int32_t unknown_90; - uint64_t mainWeaponModel; - uint64_t secWeaponModel; - uint64_t craftToolModel; - uint16_t rotation; - uint16_t model; /** 0 if look array is being used */ - uint16_t title; - uint8_t typeFlags; /** has something to do with type 4 for mobs */ - uint8_t minion; - uint8_t unknown_60; /** for players 01 */ - uint8_t unknown_61; /** for players 09 */ - uint8_t level; - uint8_t classJob; - uint32_t hPCurr; - uint16_t mPCurr; - uint16_t tPCurr; - uint32_t hPMax; - uint16_t mPMax; - uint16_t tPMax; - Common::OnlineStatus statusIcon; - uint8_t unknown_B0[17]; - uint8_t persistantPose; - uint8_t unknown_C0; - uint32_t displayFlags; - Common::StatusEffect effect[30]; - uint8_t currentMount; - uint8_t mountHead; - uint8_t mountBody; - uint8_t mountFeet; - uint32_t mountColor; - uint32_t unknown_236; - char name[32]; - uint8_t look[28]; - uint32_t models[10]; - Common::FFXIVARR_POSITION3 pos; - char fcTag[6]; - uint8_t unknown_250[10]; -}; - - /** * Structural representation of the packet sent by the server * to show player movement @@ -1136,8 +1071,8 @@ struct FFXIVIpcQuestActiveList : FFXIVIpcBasePacket */ struct FFXIVIpcQuestUpdate : FFXIVIpcBasePacket { - /* 0000 */ uint8_t slot; - /* 0001 */ uint8_t padding[3]; + uint16_t slot; + uint16_t padding; Common::QuestActive questInfo; }; diff --git a/src/servers/Server_Common/Util/LockedQueue.h b/src/common/Util/LockedQueue.h similarity index 100% rename from src/servers/Server_Common/Util/LockedQueue.h rename to src/common/Util/LockedQueue.h diff --git a/src/servers/Server_Common/Util/LockedWaitQueue.h b/src/common/Util/LockedWaitQueue.h similarity index 100% rename from src/servers/Server_Common/Util/LockedWaitQueue.h rename to src/common/Util/LockedWaitQueue.h diff --git a/src/servers/Server_Common/Util/Util.cpp b/src/common/Util/Util.cpp similarity index 100% rename from src/servers/Server_Common/Util/Util.cpp rename to src/common/Util/Util.cpp diff --git a/src/servers/Server_Common/Util/Util.h b/src/common/Util/Util.h similarity index 100% rename from src/servers/Server_Common/Util/Util.h rename to src/common/Util/Util.h diff --git a/src/servers/Server_Common/Util/UtilMath.cpp b/src/common/Util/UtilMath.cpp similarity index 100% rename from src/servers/Server_Common/Util/UtilMath.cpp rename to src/common/Util/UtilMath.cpp diff --git a/src/servers/Server_Common/Util/UtilMath.h b/src/common/Util/UtilMath.h similarity index 94% rename from src/servers/Server_Common/Util/UtilMath.h rename to src/common/Util/UtilMath.h index 7c37ed42..65e18e37 100644 --- a/src/servers/Server_Common/Util/UtilMath.h +++ b/src/common/Util/UtilMath.h @@ -1,7 +1,7 @@ #ifndef _UTILMATH_H #define _UTILMATH_H -#include "src/servers/Server_Common/Common.h" +#include #define PI 3.14159265358979323846f diff --git a/src/common/Version.cpp b/src/common/Version.cpp new file mode 100644 index 00000000..6658cae1 --- /dev/null +++ b/src/common/Version.cpp @@ -0,0 +1,10 @@ +#include "Version.h" + +namespace Core { + namespace Version { + + const std::string GIT_HASH = "d799f2e3c2d745f9d9e07d6e37664fc031b7c264"; + const std::string VERSION = "-128-NOTFOUND"; + + } /* Version */ +} /* Core */ diff --git a/src/servers/Server_Common/Version.cpp.in b/src/common/Version.cpp.in similarity index 100% rename from src/servers/Server_Common/Version.cpp.in rename to src/common/Version.cpp.in diff --git a/src/servers/Server_Common/Version.h b/src/common/Version.h similarity index 100% rename from src/servers/Server_Common/Version.h rename to src/common/Version.h diff --git a/src/servers/CMakeLists.txt b/src/servers/CMakeLists.txt index 6387b188..82613bd6 100644 --- a/src/servers/CMakeLists.txt +++ b/src/servers/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.6) -project (Sapphire_root) +project (Sapphire) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}) @@ -9,7 +9,6 @@ set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) include_directories("${PROJECT_INCLUDE_DIR}") include_directories("${PROJECT_SOURCE_DIR}") -add_subdirectory(${PROJECT_SOURCE_DIR}/Server_Common) -add_subdirectory(${PROJECT_SOURCE_DIR}/Server_Lobby) -add_subdirectory(${PROJECT_SOURCE_DIR}/Server_REST) -add_subdirectory(${PROJECT_SOURCE_DIR}/Server_Zone) +add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_lobby) +add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_api) +add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_zone) diff --git a/src/servers/Server_Common/Database/DatabaseDef.h b/src/servers/Server_Common/Database/DatabaseDef.h deleted file mode 100644 index 4009b25c..00000000 --- a/src/servers/Server_Common/Database/DatabaseDef.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef _DATABASEDEF_H -#define _DATABASEDEF_H - -#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" -#include -#include -#include -#include - -extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; - -#endif diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h deleted file mode 100644 index bc52678e..00000000 --- a/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h +++ /dev/null @@ -1,91 +0,0 @@ -#ifndef _ACTORSPAWN_H -#define _ACTORSPAWN_H - -#include -#include -#include "Actor/Player.h" -#include "Forwards.h" - -namespace Core { -namespace Network { -namespace Packets { -namespace Server { - -/** -* @brief The packet sent to spawn an actor. -*/ -class ActorSpawnPacket : - public GamePacketNew< FFXIVIpcActorSpawn, ServerZoneIpcType > -{ -public: - ActorSpawnPacket( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget ) : - GamePacketNew< FFXIVIpcActorSpawn, ServerZoneIpcType >( pPlayer->getId(), pTarget->getId() ) - { - initialize( pPlayer, pTarget ); - }; - -private: - void initialize( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget ) - { - // TODO: temporary gm rank - m_data.gmRank = 0xff; - m_data.classJob = static_cast< uint8_t >( pPlayer->getClass() ); - m_data.status = static_cast< uint8_t >( pPlayer->getStatus() ); - m_data.hPCurr = pPlayer->getHp(); - m_data.mPCurr = pPlayer->getMp(); - m_data.tPCurr = pPlayer->getTp(); - m_data.hPMax = pPlayer->getMaxHp(); - m_data.mPMax = pPlayer->getMaxMp(); - m_data.tPMax = 3000; - m_data.level = pPlayer->getLevel(); - memcpy( m_data.look, pPlayer->getLookArray(), 26 ); - m_data.mainWeaponModel = pPlayer->getModelMainWeapon(); - m_data.secWeaponModel = pPlayer->getModelSubWeapon(); - m_data.models[0] = pPlayer->getModelForSlot( Inventory::EquipSlot::Head ); - m_data.models[1] = pPlayer->getModelForSlot( Inventory::EquipSlot::Body ); - m_data.models[2] = pPlayer->getModelForSlot( Inventory::EquipSlot::Hands ); - m_data.models[3] = pPlayer->getModelForSlot( Inventory::EquipSlot::Legs ); - m_data.models[4] = pPlayer->getModelForSlot( Inventory::EquipSlot::Feet ); - strcpy( m_data.name, pPlayer->getName().c_str() ); - m_data.pos.x = pPlayer->getPos().x; - m_data.pos.y = pPlayer->getPos().y; - m_data.pos.z = pPlayer->getPos().z; - m_data.voice = pPlayer->getVoiceId(); - - m_data.rotation = Math::Util::floatToUInt16Rot( pPlayer->getRotation() ); - - m_data.statusIcon = pPlayer->getOnlineStatus(); - - if( pTarget == pPlayer ) - { - m_data.spawnIndex = 0x00; - } - else - { - m_data.spawnIndex = pTarget->getSpawnIdForActorId( pPlayer->getId() ); - } - // 0x20 == spawn hidden to be displayed by the spawneffect control - m_data.displayFlags = pPlayer->getStance(); - - if( pPlayer->getZoningType() != Common::ZoneingType::None ) - { - m_data.displayFlags |= 0x20; - } - - m_data.targetId = pPlayer->getTargetId(); - m_data.type = 1; - m_data.unknown_33 = 4; - //m_data.unknown_38 = 0x70; - //m_data.unknown_60 = 3; - //m_data.unknown_61 = 7; - - - }; -}; - -} -} -} -} - -#endif /*_ACTORSPAWN_H*/ \ No newline at end of file diff --git a/src/servers/Server_REST/CMakeLists.txt b/src/servers/sapphire_api/CMakeLists.txt similarity index 68% rename from src/servers/Server_REST/CMakeLists.txt rename to src/servers/sapphire_api/CMakeLists.txt index 47556899..21fd736e 100644 --- a/src/servers/Server_REST/CMakeLists.txt +++ b/src/servers/sapphire_api/CMakeLists.txt @@ -6,10 +6,10 @@ 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 "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") -add_executable(server_rest ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) -add_dependencies(server_rest Common xivdat) +add_executable(sapphire_api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) +add_dependencies(sapphire_api common xivdat) -set_target_properties(server_rest PROPERTIES +set_target_properties(sapphire_api PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS ON @@ -21,13 +21,13 @@ set_target_properties(server_rest PROPERTIES ) if (UNIX) - target_link_libraries (server_rest Common xivdat pthread mysqlclient mysqlConnector dl z) + target_link_libraries (sapphire_api common xivdat pthread mysqlclient mysqlConnector dl z) else() # ignore unchecked iterators warnings from msvc add_definitions(-D_SCL_SECURE_NO_WARNINGS) - target_link_libraries (server_rest Common xivdat libmysql mysqlConnector zlib1) + target_link_libraries (sapphire_api common xivdat libmysql mysqlConnector zlib1) endif() -target_link_libraries( server_rest ${Boost_LIBRARIES} ${Boost_LIBRARIES} ) +target_link_libraries( sapphire_api ${Boost_LIBRARIES} ${Boost_LIBRARIES} ) diff --git a/src/servers/Server_REST/Forwards.h b/src/servers/sapphire_api/Forwards.h similarity index 100% rename from src/servers/Server_REST/Forwards.h rename to src/servers/sapphire_api/Forwards.h diff --git a/src/servers/Server_REST/LoginSession.cpp b/src/servers/sapphire_api/LoginSession.cpp similarity index 100% rename from src/servers/Server_REST/LoginSession.cpp rename to src/servers/sapphire_api/LoginSession.cpp diff --git a/src/servers/Server_REST/LoginSession.h b/src/servers/sapphire_api/LoginSession.h similarity index 100% rename from src/servers/Server_REST/LoginSession.h rename to src/servers/sapphire_api/LoginSession.h diff --git a/src/servers/Server_REST/PlayerMinimal.cpp b/src/servers/sapphire_api/PlayerMinimal.cpp similarity index 98% rename from src/servers/Server_REST/PlayerMinimal.cpp rename to src/servers/sapphire_api/PlayerMinimal.cpp index 724475b8..3cf47acb 100644 --- a/src/servers/Server_REST/PlayerMinimal.cpp +++ b/src/servers/sapphire_api/PlayerMinimal.cpp @@ -1,10 +1,10 @@ #include "PlayerMinimal.h" -#include -#include -#include +#include +#include +#include -#include +#include extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_REST/PlayerMinimal.h b/src/servers/sapphire_api/PlayerMinimal.h similarity index 100% rename from src/servers/Server_REST/PlayerMinimal.h rename to src/servers/sapphire_api/PlayerMinimal.h diff --git a/src/servers/Server_REST/SapphireAPI.cpp b/src/servers/sapphire_api/SapphireAPI.cpp similarity index 98% rename from src/servers/Server_REST/SapphireAPI.cpp rename to src/servers/sapphire_api/SapphireAPI.cpp index 5fbc108e..5372232d 100644 --- a/src/servers/Server_REST/SapphireAPI.cpp +++ b/src/servers/sapphire_api/SapphireAPI.cpp @@ -1,5 +1,5 @@ #include "SapphireAPI.h" -#include +#include #include "Session.h" #include "PlayerMinimal.h" #include @@ -11,7 +11,7 @@ #include #include -#include +#include #include Core::Network::SapphireAPI::SapphireAPI() diff --git a/src/servers/Server_REST/SapphireAPI.h b/src/servers/sapphire_api/SapphireAPI.h similarity index 100% rename from src/servers/Server_REST/SapphireAPI.h rename to src/servers/sapphire_api/SapphireAPI.h diff --git a/src/servers/Server_REST/Session.cpp b/src/servers/sapphire_api/Session.cpp similarity index 100% rename from src/servers/Server_REST/Session.cpp rename to src/servers/sapphire_api/Session.cpp diff --git a/src/servers/Server_REST/Session.h b/src/servers/sapphire_api/Session.h similarity index 100% rename from src/servers/Server_REST/Session.h rename to src/servers/sapphire_api/Session.h diff --git a/src/servers/Server_REST/client_http.hpp b/src/servers/sapphire_api/client_http.hpp similarity index 100% rename from src/servers/Server_REST/client_http.hpp rename to src/servers/sapphire_api/client_http.hpp diff --git a/src/servers/Server_REST/main.cpp b/src/servers/sapphire_api/main.cpp similarity index 97% rename from src/servers/Server_REST/main.cpp rename to src/servers/sapphire_api/main.cpp index 88500536..9093ee8d 100644 --- a/src/servers/Server_REST/main.cpp +++ b/src/servers/sapphire_api/main.cpp @@ -6,21 +6,20 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include - -#include -#include -#include -#include +#include +#include +#include +#include //Added for the default_resource example #include diff --git a/src/servers/Server_REST/server_http.hpp b/src/servers/sapphire_api/server_http.hpp similarity index 100% rename from src/servers/Server_REST/server_http.hpp rename to src/servers/sapphire_api/server_http.hpp diff --git a/src/servers/Server_Lobby/CMakeLists.txt b/src/servers/sapphire_lobby/CMakeLists.txt similarity index 65% rename from src/servers/Server_Lobby/CMakeLists.txt rename to src/servers/sapphire_lobby/CMakeLists.txt index ae31962a..1674c61d 100644 --- a/src/servers/Server_Lobby/CMakeLists.txt +++ b/src/servers/sapphire_lobby/CMakeLists.txt @@ -7,10 +7,10 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") -add_executable(server_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) -add_dependencies(server_lobby Common xivdat) +add_executable(sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) +add_dependencies(sapphire_lobby common xivdat) -set_target_properties(server_lobby PROPERTIES +set_target_properties(sapphire_lobby PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS ON @@ -22,9 +22,9 @@ set_target_properties(server_lobby PROPERTIES ) if (UNIX) - target_link_libraries(server_lobby Common xivdat pthread mysqlclient mysqlConnector dl z) + target_link_libraries(sapphire_lobby common xivdat pthread mysqlclient mysqlConnector dl z) else() - target_link_libraries(server_lobby Common xivdat libmysql mysqlConnector zlib1) + target_link_libraries(sapphire_lobby common xivdat libmysql mysqlConnector zlib1) endif() -target_link_libraries(server_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES}) +target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES}) diff --git a/src/servers/Server_Lobby/Forwards.h b/src/servers/sapphire_lobby/Forwards.h similarity index 100% rename from src/servers/Server_Lobby/Forwards.h rename to src/servers/sapphire_lobby/Forwards.h diff --git a/src/servers/Server_Lobby/GameConnection.cpp b/src/servers/sapphire_lobby/GameConnection.cpp similarity index 96% rename from src/servers/Server_Lobby/GameConnection.cpp rename to src/servers/sapphire_lobby/GameConnection.cpp index 1256dca2..8d9a52a3 100644 --- a/src/servers/Server_Lobby/GameConnection.cpp +++ b/src/servers/sapphire_lobby/GameConnection.cpp @@ -1,29 +1,21 @@ -#include -#include -#include -#include -#include -#include -#include -#include "Server_Common/Network/GamePacketParser.h" -#include - -#include -#include -#include -#include - #include "GameConnection.h" -#include "ServerLobby.h" -#include "LobbyPacketContainer.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ServerLobby.h" #include "RestConnector.h" #include "LobbySession.h" -#include "Forwards.h" -#include "src/servers/Server_Common/Crypt/blowfish.h" - - extern Core::Logger g_log; extern Core::ServerLobby g_serverLobby; diff --git a/src/servers/Server_Lobby/GameConnection.h b/src/servers/sapphire_lobby/GameConnection.h similarity index 85% rename from src/servers/Server_Lobby/GameConnection.h rename to src/servers/sapphire_lobby/GameConnection.h index 3d97e0f0..5af52cc5 100644 --- a/src/servers/Server_Lobby/GameConnection.h +++ b/src/servers/sapphire_lobby/GameConnection.h @@ -1,17 +1,16 @@ #ifndef GAMECONNECTION_H #define GAMECONNECTION_H -#include -#include -#include +#include +#include +#include + +#include +#include +#include -#include -#include #include "LobbyPacketContainer.h" - -#include - #include "Forwards.h" #define DECLARE_HANDLER( x ) void x( Packets::GamePacketPtr pInPacket, Entity::PlayerPtr pPlayer ) @@ -84,4 +83,4 @@ public: } -#endif \ No newline at end of file +#endif diff --git a/src/servers/Server_Lobby/LobbyPacketContainer.cpp b/src/servers/sapphire_lobby/LobbyPacketContainer.cpp similarity index 90% rename from src/servers/Server_Lobby/LobbyPacketContainer.cpp rename to src/servers/sapphire_lobby/LobbyPacketContainer.cpp index 052e92c3..30870ff5 100644 --- a/src/servers/Server_Lobby/LobbyPacketContainer.cpp +++ b/src/servers/sapphire_lobby/LobbyPacketContainer.cpp @@ -1,7 +1,7 @@ #include "LobbyPacketContainer.h" -#include -#include -#include +#include +#include +#include namespace Core { namespace Network { diff --git a/src/servers/Server_Lobby/LobbyPacketContainer.h b/src/servers/sapphire_lobby/LobbyPacketContainer.h similarity index 88% rename from src/servers/Server_Lobby/LobbyPacketContainer.h rename to src/servers/sapphire_lobby/LobbyPacketContainer.h index 970cef15..d5812402 100644 --- a/src/servers/Server_Lobby/LobbyPacketContainer.h +++ b/src/servers/sapphire_lobby/LobbyPacketContainer.h @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include "Forwards.h" diff --git a/src/servers/Server_Lobby/LobbySession.cpp b/src/servers/sapphire_lobby/LobbySession.cpp similarity index 100% rename from src/servers/Server_Lobby/LobbySession.cpp rename to src/servers/sapphire_lobby/LobbySession.cpp diff --git a/src/servers/Server_Lobby/LobbySession.h b/src/servers/sapphire_lobby/LobbySession.h similarity index 100% rename from src/servers/Server_Lobby/LobbySession.h rename to src/servers/sapphire_lobby/LobbySession.h diff --git a/src/servers/Server_Lobby/RestConnector.cpp b/src/servers/sapphire_lobby/RestConnector.cpp similarity index 98% rename from src/servers/Server_Lobby/RestConnector.cpp rename to src/servers/sapphire_lobby/RestConnector.cpp index d37667a6..667bff52 100644 --- a/src/servers/Server_Lobby/RestConnector.cpp +++ b/src/servers/sapphire_lobby/RestConnector.cpp @@ -1,8 +1,8 @@ #include "RestConnector.h" #include "LobbySession.h" #include "ServerLobby.h" -#include -#include +#include +#include #include #include diff --git a/src/servers/Server_Lobby/RestConnector.h b/src/servers/sapphire_lobby/RestConnector.h similarity index 100% rename from src/servers/Server_Lobby/RestConnector.h rename to src/servers/sapphire_lobby/RestConnector.h diff --git a/src/servers/Server_Lobby/ServerLobby.cpp b/src/servers/sapphire_lobby/ServerLobby.cpp similarity index 93% rename from src/servers/Server_Lobby/ServerLobby.cpp rename to src/servers/sapphire_lobby/ServerLobby.cpp index 9d0a6d3c..9c0e05d3 100644 --- a/src/servers/Server_Lobby/ServerLobby.cpp +++ b/src/servers/sapphire_lobby/ServerLobby.cpp @@ -3,12 +3,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include //#include "LobbySession.h" diff --git a/src/servers/Server_Lobby/ServerLobby.h b/src/servers/sapphire_lobby/ServerLobby.h similarity index 94% rename from src/servers/Server_Lobby/ServerLobby.h rename to src/servers/sapphire_lobby/ServerLobby.h index 6b3b175f..9c0da9b5 100644 --- a/src/servers/Server_Lobby/ServerLobby.h +++ b/src/servers/sapphire_lobby/ServerLobby.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include "Forwards.h" diff --git a/src/servers/Server_Lobby/client_http.hpp b/src/servers/sapphire_lobby/client_http.hpp similarity index 100% rename from src/servers/Server_Lobby/client_http.hpp rename to src/servers/sapphire_lobby/client_http.hpp diff --git a/src/servers/Server_Lobby/mainLobbyServer.cpp b/src/servers/sapphire_lobby/mainLobbyServer.cpp similarity index 100% rename from src/servers/Server_Lobby/mainLobbyServer.cpp rename to src/servers/sapphire_lobby/mainLobbyServer.cpp diff --git a/src/servers/Server_Zone/Action/Action.cpp b/src/servers/sapphire_zone/Action/Action.cpp similarity index 97% rename from src/servers/Server_Zone/Action/Action.cpp rename to src/servers/sapphire_zone/Action/Action.cpp index 1405f45a..56512f09 100644 --- a/src/servers/Server_Zone/Action/Action.cpp +++ b/src/servers/sapphire_zone/Action/Action.cpp @@ -1,6 +1,6 @@ #include "Action.h" -#include +#include Core::Action::Action::Action() diff --git a/src/servers/Server_Zone/Action/Action.h b/src/servers/sapphire_zone/Action/Action.h similarity index 93% rename from src/servers/Server_Zone/Action/Action.h rename to src/servers/sapphire_zone/Action/Action.h index 3c270180..8cd4c3cc 100644 --- a/src/servers/Server_Zone/Action/Action.h +++ b/src/servers/sapphire_zone/Action/Action.h @@ -1,10 +1,11 @@ #ifndef _ACTION_H_ #define _ACTION_H_ -#include +#include #include "../Forwards.h" -namespace Core { namespace Action { +namespace Core { +namespace Action { class Action { diff --git a/src/servers/Server_Zone/Action/ActionCast.cpp b/src/servers/sapphire_zone/Action/ActionCast.cpp similarity index 94% rename from src/servers/Server_Zone/Action/ActionCast.cpp rename to src/servers/sapphire_zone/Action/ActionCast.cpp index 7fc79ea3..002504fd 100644 --- a/src/servers/Server_Zone/Action/ActionCast.cpp +++ b/src/servers/sapphire_zone/Action/ActionCast.cpp @@ -1,10 +1,10 @@ #include "ActionCast.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" diff --git a/src/servers/Server_Zone/Action/ActionCast.h b/src/servers/sapphire_zone/Action/ActionCast.h similarity index 100% rename from src/servers/Server_Zone/Action/ActionCast.h rename to src/servers/sapphire_zone/Action/ActionCast.h diff --git a/src/servers/Server_Zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp similarity index 97% rename from src/servers/Server_Zone/Action/ActionCollision.cpp rename to src/servers/sapphire_zone/Action/ActionCollision.cpp index 6eb11182..8a42d3c1 100644 --- a/src/servers/Server_Zone/Action/ActionCollision.cpp +++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include "ActionCollision.h" #include "Actor/Actor.h" diff --git a/src/servers/Server_Zone/Action/ActionCollision.h b/src/servers/sapphire_zone/Action/ActionCollision.h similarity index 97% rename from src/servers/Server_Zone/Action/ActionCollision.h rename to src/servers/sapphire_zone/Action/ActionCollision.h index db3f7120..f70f6f7a 100644 --- a/src/servers/Server_Zone/Action/ActionCollision.h +++ b/src/servers/sapphire_zone/Action/ActionCollision.h @@ -1,7 +1,7 @@ #ifndef _ACTIONCOLLISION_H #define _ACTIONCOLLISION_H -#include +#include #include "Actor/Actor.h" #include "Action.h" diff --git a/src/servers/Server_Zone/Action/ActionMount.cpp b/src/servers/sapphire_zone/Action/ActionMount.cpp similarity index 94% rename from src/servers/Server_Zone/Action/ActionMount.cpp rename to src/servers/sapphire_zone/Action/ActionMount.cpp index b45b460f..6ff6c8b9 100644 --- a/src/servers/Server_Zone/Action/ActionMount.cpp +++ b/src/servers/sapphire_zone/Action/ActionMount.cpp @@ -1,10 +1,10 @@ #include "ActionMount.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" diff --git a/src/servers/Server_Zone/Action/ActionMount.h b/src/servers/sapphire_zone/Action/ActionMount.h similarity index 100% rename from src/servers/Server_Zone/Action/ActionMount.h rename to src/servers/sapphire_zone/Action/ActionMount.h diff --git a/src/servers/Server_Zone/Action/ActionTeleport.cpp b/src/servers/sapphire_zone/Action/ActionTeleport.cpp similarity index 96% rename from src/servers/Server_Zone/Action/ActionTeleport.cpp rename to src/servers/sapphire_zone/Action/ActionTeleport.cpp index c201b0cc..7e8cec18 100644 --- a/src/servers/Server_Zone/Action/ActionTeleport.cpp +++ b/src/servers/sapphire_zone/Action/ActionTeleport.cpp @@ -1,8 +1,8 @@ #include "ActionTeleport.h" -#include -#include -#include +#include +#include +#include #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" diff --git a/src/servers/Server_Zone/Action/ActionTeleport.h b/src/servers/sapphire_zone/Action/ActionTeleport.h similarity index 100% rename from src/servers/Server_Zone/Action/ActionTeleport.h rename to src/servers/sapphire_zone/Action/ActionTeleport.h diff --git a/src/servers/Server_Zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp similarity index 95% rename from src/servers/Server_Zone/Action/EventAction.cpp rename to src/servers/sapphire_zone/Action/EventAction.cpp index 5e6a9cf3..b174bdad 100644 --- a/src/servers/Server_Zone/Action/EventAction.cpp +++ b/src/servers/sapphire_zone/Action/EventAction.cpp @@ -1,12 +1,12 @@ -#include -#include -#include +#include +#include +#include #include "EventAction.h" #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" -#include "Server_Zone/Actor/Player.h" -#include "Server_Zone/Event/Event.h" +#include "Actor/Player.h" +#include "Event/Event.h" extern Core::Logger g_log; extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Action/EventAction.h b/src/servers/sapphire_zone/Action/EventAction.h similarity index 95% rename from src/servers/Server_Zone/Action/EventAction.h rename to src/servers/sapphire_zone/Action/EventAction.h index 6f8e5614..f0857d34 100644 --- a/src/servers/Server_Zone/Action/EventAction.h +++ b/src/servers/sapphire_zone/Action/EventAction.h @@ -1,7 +1,7 @@ #ifndef _EVENTACTION_H_ #define _EVENTACTION_H_ -#include +#include #include "../Forwards.h" #include "Action.h" diff --git a/src/servers/Server_Zone/Action/EventItemAction.cpp b/src/servers/sapphire_zone/Action/EventItemAction.cpp similarity index 96% rename from src/servers/Server_Zone/Action/EventItemAction.cpp rename to src/servers/sapphire_zone/Action/EventItemAction.cpp index 6c85b183..3a8c3f78 100644 --- a/src/servers/Server_Zone/Action/EventItemAction.cpp +++ b/src/servers/sapphire_zone/Action/EventItemAction.cpp @@ -1,8 +1,8 @@ #include "EventItemAction.h" -#include -#include -#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Action/EventItemAction.h b/src/servers/sapphire_zone/Action/EventItemAction.h similarity index 100% rename from src/servers/Server_Zone/Action/EventItemAction.h rename to src/servers/sapphire_zone/Action/EventItemAction.h diff --git a/src/servers/Server_Zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp similarity index 99% rename from src/servers/Server_Zone/Actor/Actor.cpp rename to src/servers/sapphire_zone/Actor/Actor.cpp index 3439fef7..dca46593 100644 --- a/src/servers/Server_Zone/Actor/Actor.cpp +++ b/src/servers/sapphire_zone/Actor/Actor.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Forwards.h" #include "Action/Action.h" diff --git a/src/servers/Server_Zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h similarity index 99% rename from src/servers/Server_Zone/Actor/Actor.h rename to src/servers/sapphire_zone/Actor/Actor.h index 35547b01..aee58d2e 100644 --- a/src/servers/Server_Zone/Actor/Actor.h +++ b/src/servers/sapphire_zone/Actor/Actor.h @@ -1,7 +1,7 @@ #ifndef _ACTOR_H_ #define _ACTOR_H_ -#include +#include #include #include "Forwards.h" diff --git a/src/servers/Server_Zone/Actor/BattleNpc.cpp b/src/servers/sapphire_zone/Actor/BattleNpc.cpp similarity index 99% rename from src/servers/Server_Zone/Actor/BattleNpc.cpp rename to src/servers/sapphire_zone/Actor/BattleNpc.cpp index e76003d7..46ab6a8b 100644 --- a/src/servers/Server_Zone/Actor/BattleNpc.cpp +++ b/src/servers/sapphire_zone/Actor/BattleNpc.cpp @@ -4,10 +4,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "Player.h" #include "BattleNpc.h" diff --git a/src/servers/Server_Zone/Actor/BattleNpc.h b/src/servers/sapphire_zone/Actor/BattleNpc.h similarity index 100% rename from src/servers/Server_Zone/Actor/BattleNpc.h rename to src/servers/sapphire_zone/Actor/BattleNpc.h diff --git a/src/servers/Server_Zone/Actor/BattleNpcTemplate.cpp b/src/servers/sapphire_zone/Actor/BattleNpcTemplate.cpp similarity index 100% rename from src/servers/Server_Zone/Actor/BattleNpcTemplate.cpp rename to src/servers/sapphire_zone/Actor/BattleNpcTemplate.cpp diff --git a/src/servers/Server_Zone/Actor/BattleNpcTemplate.h b/src/servers/sapphire_zone/Actor/BattleNpcTemplate.h similarity index 100% rename from src/servers/Server_Zone/Actor/BattleNpcTemplate.h rename to src/servers/sapphire_zone/Actor/BattleNpcTemplate.h diff --git a/src/servers/Server_Zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp similarity index 99% rename from src/servers/Server_Zone/Actor/Player.cpp rename to src/servers/sapphire_zone/Actor/Player.cpp index ff7131e2..6365098b 100644 --- a/src/servers/Server_Zone/Actor/Player.cpp +++ b/src/servers/sapphire_zone/Actor/Player.cpp @@ -1,11 +1,11 @@ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Session.h" #include "Player.h" @@ -23,7 +23,6 @@ #include "Network/PacketWrappers/ServerNoticePacket.h" #include "Network/PacketWrappers/ChatPacket.h" #include "Network/PacketWrappers/ModelEquipPacket.h" -#include "Network/PacketWrappers/ActorSpawnPacket.h" #include "Network/PacketWrappers/UpdateHpMpTpPacket.h" #include "Network/PacketWrappers/PlayerStateFlagsPacket.h" #include "Network/PacketWrappers/PlayerSpawnPacket.h" diff --git a/src/servers/Server_Zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h similarity index 99% rename from src/servers/Server_Zone/Actor/Player.h rename to src/servers/sapphire_zone/Actor/Player.h index 087cc6f0..ea7b7027 100644 --- a/src/servers/Server_Zone/Actor/Player.h +++ b/src/servers/sapphire_zone/Actor/Player.h @@ -3,7 +3,7 @@ #include "Forwards.h" -#include +#include #include "Actor.h" #include "Inventory/Inventory.h" diff --git a/src/servers/Server_Zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp similarity index 97% rename from src/servers/Server_Zone/Actor/PlayerEvent.cpp rename to src/servers/sapphire_zone/Actor/PlayerEvent.cpp index 0f4b5aae..a48aea17 100644 --- a/src/servers/Server_Zone/Actor/PlayerEvent.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Player.h" diff --git a/src/servers/Server_Zone/Actor/PlayerInventory.cpp b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp similarity index 97% rename from src/servers/Server_Zone/Actor/PlayerInventory.cpp rename to src/servers/sapphire_zone/Actor/PlayerInventory.cpp index c35fb10a..6e201984 100644 --- a/src/servers/Server_Zone/Actor/PlayerInventory.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include "Player.h" diff --git a/src/servers/Server_Zone/Actor/PlayerQuest.cpp b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp similarity index 98% rename from src/servers/Server_Zone/Actor/PlayerQuest.cpp rename to src/servers/sapphire_zone/Actor/PlayerQuest.cpp index fa938d33..3a4c144d 100644 --- a/src/servers/Server_Zone/Actor/PlayerQuest.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp @@ -1,16 +1,16 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Network/GameConnection.h" #include "Network/PacketWrappers/QuestMessagePacket.h" -#include "Server_Zone/Session.h" +#include "Session.h" +#include "Inventory/Inventory.h" #include "Player.h" -#include "Server_Zone/Inventory/Inventory.h" extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp similarity index 97% rename from src/servers/Server_Zone/Actor/PlayerSql.cpp rename to src/servers/sapphire_zone/Actor/PlayerSql.cpp index 2d92fbb9..5a242c52 100644 --- a/src/servers/Server_Zone/Actor/PlayerSql.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp @@ -1,13 +1,13 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/servers/Server_Zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt similarity index 75% rename from src/servers/Server_Zone/CMakeLists.txt rename to src/servers/sapphire_zone/CMakeLists.txt index bfb8183f..c091712d 100644 --- a/src/servers/Server_Zone/CMakeLists.txt +++ b/src/servers/sapphire_zone/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0015 NEW) cmake_policy(SET CMP0014 OLD) -project(Sapphire_Zone) +project(sapphire_zone) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} @@ -13,7 +13,7 @@ file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Event/*.h Inventory/*.h Linkshell/*.h - Math/*.h + Math/*.h Network/*.h Network/Handlers/*.h Network/PacketWrappers/*.h @@ -29,7 +29,7 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Event/*.c* Inventory/*.c* Linkshell/*.c* - Math/*.c* + Math/*.c* Network/*.c* Network/Handlers/*.c* Network/PacketWrappers/*.c* @@ -39,10 +39,10 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") -add_executable(server_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} ) -add_dependencies(server_zone Common xivdat mysqlConnector ) +add_executable(sapphire_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} ) +add_dependencies(sapphire_zone common xivdat mysqlConnector ) -set_target_properties(server_zone PROPERTIES +set_target_properties(sapphire_zone PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS ON @@ -56,9 +56,9 @@ set_target_properties(server_zone PROPERTIES ) if (UNIX) - target_link_libraries ( server_zone Common xivdat pthread mysqlclient mysqlConnector dl z ) + target_link_libraries ( sapphire_zone common xivdat pthread mysqlclient mysqlConnector dl z ) else() - target_link_libraries ( server_zone Common xivdat libmysql zlib1 mysqlConnector ) + target_link_libraries ( sapphire_zone common xivdat libmysql zlib1 mysqlConnector ) endif() -target_link_libraries(server_zone ${Boost_LIBRARIES} ) +target_link_libraries( sapphire_zone ${Boost_LIBRARIES} ) diff --git a/src/servers/Server_Zone/ContentFinder/ContentFinder.cpp b/src/servers/sapphire_zone/ContentFinder/ContentFinder.cpp similarity index 100% rename from src/servers/Server_Zone/ContentFinder/ContentFinder.cpp rename to src/servers/sapphire_zone/ContentFinder/ContentFinder.cpp diff --git a/src/servers/Server_Zone/ContentFinder/ContentFinder.h b/src/servers/sapphire_zone/ContentFinder/ContentFinder.h similarity index 100% rename from src/servers/Server_Zone/ContentFinder/ContentFinder.h rename to src/servers/sapphire_zone/ContentFinder/ContentFinder.h diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommand.h b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h similarity index 97% rename from src/servers/Server_Zone/DebugCommand/DebugCommand.h rename to src/servers/sapphire_zone/DebugCommand/DebugCommand.h index c6131a75..03c01a30 100644 --- a/src/servers/Server_Zone/DebugCommand/DebugCommand.h +++ b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h @@ -1,7 +1,7 @@ #ifndef _GAMECOMMAND_H_ #define _GAMECOMMAND_H_ -#include +#include #include "Actor/Player.h" #include "Forwards.h" diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp similarity index 98% rename from src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp rename to src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp index dceb3432..dccb6ce8 100644 --- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp +++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp @@ -1,14 +1,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "DebugCommand.h" #include "DebugCommandHandler.h" diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h similarity index 98% rename from src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h rename to src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h index 4da90f29..930da36b 100644 --- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h +++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h @@ -4,7 +4,7 @@ #include #include "DebugCommand.h" -#include +#include #include "Forwards.h" namespace Core { diff --git a/src/servers/Server_Zone/Event/Event.cpp b/src/servers/sapphire_zone/Event/Event.cpp similarity index 100% rename from src/servers/Server_Zone/Event/Event.cpp rename to src/servers/sapphire_zone/Event/Event.cpp diff --git a/src/servers/Server_Zone/Event/Event.h b/src/servers/sapphire_zone/Event/Event.h similarity index 100% rename from src/servers/Server_Zone/Event/Event.h rename to src/servers/sapphire_zone/Event/Event.h diff --git a/src/servers/Server_Zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp similarity index 95% rename from src/servers/Server_Zone/Event/EventHelper.cpp rename to src/servers/sapphire_zone/Event/EventHelper.cpp index 0ec74b98..9d90cc3e 100644 --- a/src/servers/Server_Zone/Event/EventHelper.cpp +++ b/src/servers/sapphire_zone/Event/EventHelper.cpp @@ -1,7 +1,7 @@ #include "EventHelper.h" #include "Event.h" -#include -#include +#include +#include extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Event/EventHelper.h b/src/servers/sapphire_zone/Event/EventHelper.h similarity index 91% rename from src/servers/Server_Zone/Event/EventHelper.h rename to src/servers/sapphire_zone/Event/EventHelper.h index e8c531f2..5d7a1dbb 100644 --- a/src/servers/Server_Zone/Event/EventHelper.h +++ b/src/servers/sapphire_zone/Event/EventHelper.h @@ -1,7 +1,7 @@ #ifndef _EVENTHELPER_H #define _EVENTHELPER_H -#include +#include #include namespace Core { @@ -10,7 +10,6 @@ namespace Core { std::string getEventName( uint32_t eventId ); uint32_t mapEventActorToRealActor( uint32_t eventActorId ); - } } #endif diff --git a/src/servers/Server_Zone/Forwards.h b/src/servers/sapphire_zone/Forwards.h similarity index 100% rename from src/servers/Server_Zone/Forwards.h rename to src/servers/sapphire_zone/Forwards.h diff --git a/src/servers/Server_Zone/Inventory/Inventory.cpp b/src/servers/sapphire_zone/Inventory/Inventory.cpp similarity index 99% rename from src/servers/Server_Zone/Inventory/Inventory.cpp rename to src/servers/sapphire_zone/Inventory/Inventory.cpp index dbcd2080..7d2275a4 100644 --- a/src/servers/Server_Zone/Inventory/Inventory.cpp +++ b/src/servers/sapphire_zone/Inventory/Inventory.cpp @@ -1,7 +1,8 @@ -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Inventory.h" @@ -18,7 +19,6 @@ #include "../Forwards.h" #include "Network/PacketWrappers/ActorControlPacket143.h" -#include extern Core::Logger g_log; extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Inventory/Inventory.h b/src/servers/sapphire_zone/Inventory/Inventory.h similarity index 99% rename from src/servers/Server_Zone/Inventory/Inventory.h rename to src/servers/sapphire_zone/Inventory/Inventory.h index 508c4733..8be14a2d 100644 --- a/src/servers/Server_Zone/Inventory/Inventory.h +++ b/src/servers/sapphire_zone/Inventory/Inventory.h @@ -1,7 +1,7 @@ #ifndef INVENTORY_H_ #define INVENTORY_H_ #include -#include +#include #include "../Forwards.h" namespace Core diff --git a/src/servers/Server_Zone/Inventory/Item.cpp b/src/servers/sapphire_zone/Inventory/Item.cpp similarity index 96% rename from src/servers/Server_Zone/Inventory/Item.cpp rename to src/servers/sapphire_zone/Inventory/Item.cpp index 2844c73e..e77c4ca4 100644 --- a/src/servers/Server_Zone/Inventory/Item.cpp +++ b/src/servers/sapphire_zone/Inventory/Item.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "Item.h" extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Inventory/Item.h b/src/servers/sapphire_zone/Inventory/Item.h similarity index 97% rename from src/servers/Server_Zone/Inventory/Item.h rename to src/servers/sapphire_zone/Inventory/Item.h index fdb3e6a3..dc811e37 100644 --- a/src/servers/Server_Zone/Inventory/Item.h +++ b/src/servers/sapphire_zone/Inventory/Item.h @@ -1,7 +1,7 @@ #ifndef _ITEM_H_ #define _ITEM_H_ -#include +#include namespace Core { diff --git a/src/servers/Server_Zone/Inventory/ItemContainer.cpp b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp similarity index 93% rename from src/servers/Server_Zone/Inventory/ItemContainer.cpp rename to src/servers/sapphire_zone/Inventory/ItemContainer.cpp index baa3da34..109cc17c 100644 --- a/src/servers/Server_Zone/Inventory/ItemContainer.cpp +++ b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp @@ -1,9 +1,9 @@ #include "../Forwards.h" #include "ItemContainer.h" -#include -#include -#include +#include +#include +#include #include "Actor/Player.h" diff --git a/src/servers/Server_Zone/Inventory/ItemContainer.h b/src/servers/sapphire_zone/Inventory/ItemContainer.h similarity index 95% rename from src/servers/Server_Zone/Inventory/ItemContainer.h rename to src/servers/sapphire_zone/Inventory/ItemContainer.h index 8147905d..6d2fcc4f 100644 --- a/src/servers/Server_Zone/Inventory/ItemContainer.h +++ b/src/servers/sapphire_zone/Inventory/ItemContainer.h @@ -3,7 +3,7 @@ #include -#include +#include #include "../Forwards.h" diff --git a/src/servers/Server_Zone/Linkshell/Linkshell.cpp b/src/servers/sapphire_zone/Linkshell/Linkshell.cpp similarity index 100% rename from src/servers/Server_Zone/Linkshell/Linkshell.cpp rename to src/servers/sapphire_zone/Linkshell/Linkshell.cpp diff --git a/src/servers/Server_Zone/Linkshell/Linkshell.h b/src/servers/sapphire_zone/Linkshell/Linkshell.h similarity index 97% rename from src/servers/Server_Zone/Linkshell/Linkshell.h rename to src/servers/sapphire_zone/Linkshell/Linkshell.h index 62ca1781..890f97fe 100644 --- a/src/servers/Server_Zone/Linkshell/Linkshell.h +++ b/src/servers/sapphire_zone/Linkshell/Linkshell.h @@ -1,7 +1,7 @@ #ifndef CORE_LINKSHELL_H #define CORE_LINKSHELL_H -#include +#include #include namespace Core diff --git a/src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp similarity index 95% rename from src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp rename to src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp index e584bced..f2778a73 100644 --- a/src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp +++ b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp @@ -1,7 +1,7 @@ #include "LinkshellMgr.h" -#include #include -#include +#include +#include #include "Linkshell.h" diff --git a/src/servers/Server_Zone/Linkshell/LinkshellMgr.h b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.h similarity index 100% rename from src/servers/Server_Zone/Linkshell/LinkshellMgr.h rename to src/servers/sapphire_zone/Linkshell/LinkshellMgr.h diff --git a/src/servers/Server_Zone/Math/CalcBattle.cpp b/src/servers/sapphire_zone/Math/CalcBattle.cpp similarity index 94% rename from src/servers/Server_Zone/Math/CalcBattle.cpp rename to src/servers/sapphire_zone/Math/CalcBattle.cpp index f68d1872..12f93936 100644 --- a/src/servers/Server_Zone/Math/CalcBattle.cpp +++ b/src/servers/sapphire_zone/Math/CalcBattle.cpp @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include #include "Actor/Actor.h" #include "Actor/Player.h" #include "CalcBattle.h" diff --git a/src/servers/Server_Zone/Math/CalcBattle.h b/src/servers/sapphire_zone/Math/CalcBattle.h similarity index 89% rename from src/servers/Server_Zone/Math/CalcBattle.h rename to src/servers/sapphire_zone/Math/CalcBattle.h index b373ac99..8c43107f 100644 --- a/src/servers/Server_Zone/Math/CalcBattle.h +++ b/src/servers/sapphire_zone/Math/CalcBattle.h @@ -1,7 +1,7 @@ #ifndef _CALCBATTLE_H #define _CALCBATTLE_H -#include +#include #include "Actor/Actor.h" using namespace Core::Entity; diff --git a/src/servers/Server_Zone/Math/CalcStats.cpp b/src/servers/sapphire_zone/Math/CalcStats.cpp similarity index 98% rename from src/servers/Server_Zone/Math/CalcStats.cpp rename to src/servers/sapphire_zone/Math/CalcStats.cpp index 0e31d183..2e390887 100644 --- a/src/servers/Server_Zone/Math/CalcStats.cpp +++ b/src/servers/sapphire_zone/Math/CalcStats.cpp @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include #include "Actor/Actor.h" #include "Actor/Player.h" diff --git a/src/servers/Server_Zone/Math/CalcStats.h b/src/servers/sapphire_zone/Math/CalcStats.h similarity index 91% rename from src/servers/Server_Zone/Math/CalcStats.h rename to src/servers/sapphire_zone/Math/CalcStats.h index 94a0a324..2bf17da5 100644 --- a/src/servers/Server_Zone/Math/CalcStats.h +++ b/src/servers/sapphire_zone/Math/CalcStats.h @@ -1,7 +1,7 @@ #ifndef _CALCSTATS_H #define _CALCSTATS_H -#include +#include #include "Actor/Actor.h" using namespace Core::Entity; diff --git a/src/servers/Server_Zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp similarity index 98% rename from src/servers/Server_Zone/Network/GameConnection.cpp rename to src/servers/sapphire_zone/Network/GameConnection.cpp index 1a52c5f6..817a2278 100644 --- a/src/servers/Server_Zone/Network/GameConnection.cpp +++ b/src/servers/sapphire_zone/Network/GameConnection.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include "GameConnection.h" diff --git a/src/servers/Server_Zone/Network/GameConnection.h b/src/servers/sapphire_zone/Network/GameConnection.h similarity index 93% rename from src/servers/Server_Zone/Network/GameConnection.h rename to src/servers/sapphire_zone/Network/GameConnection.h index d4e2dfc2..2d283067 100644 --- a/src/servers/Server_Zone/Network/GameConnection.h +++ b/src/servers/sapphire_zone/Network/GameConnection.h @@ -1,11 +1,11 @@ #ifndef GAMECONNECTION_H #define GAMECONNECTION_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp similarity index 97% rename from src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp rename to src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp index 86404013..b1494413 100644 --- a/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp similarity index 92% rename from src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp rename to src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp index b3df64e5..f9f6fb8d 100644 --- a/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Network/GameConnection.h" #include "Session.h" diff --git a/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp similarity index 95% rename from src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp rename to src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp index 8a9f814b..54875ca5 100644 --- a/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp similarity index 98% rename from src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp rename to src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp index 923b37b9..736a1fd8 100644 --- a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp similarity index 90% rename from src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp rename to src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp index 52aaaad3..3f87d2ab 100644 --- a/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp similarity index 98% rename from src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp rename to src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp index 4fc80e64..fe58f3aa 100644 --- a/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp @@ -1,11 +1,11 @@ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp similarity index 93% rename from src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp rename to src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp index eaaa1d2b..38b339c7 100644 --- a/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h similarity index 88% rename from src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h rename to src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h index 6a6ae79b..0bd3d00e 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h @@ -1,8 +1,8 @@ #ifndef _ACTORCONTROL142_H #define _ACTORCONTROL142_H -#include -#include +#include +#include #include "Forwards.h" namespace Core { @@ -46,4 +46,4 @@ private: } } -#endif /*_ACTORCONTROL142_H*/ \ No newline at end of file +#endif /*_ACTORCONTROL142_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h similarity index 89% rename from src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h rename to src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h index 09dafb08..48287018 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h @@ -1,8 +1,8 @@ #ifndef _ACTORCONTROL143_H #define _ACTORCONTROL143_H -#include -#include +#include +#include #include "Forwards.h" @@ -49,4 +49,4 @@ private: } } -#endif /*_ACTORCONTROL143_H*/ \ No newline at end of file +#endif /*_ACTORCONTROL143_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h similarity index 89% rename from src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h rename to src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h index ab5d3dad..b2104e96 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h @@ -1,8 +1,8 @@ #ifndef _ACTORCONTROL144_H #define _ACTORCONTROL144_H -#include -#include +#include +#include namespace Core { namespace Network { @@ -47,4 +47,4 @@ private: } } -#endif /*_ACTORCONTROL144_H*/ \ No newline at end of file +#endif /*_ACTORCONTROL144_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h similarity index 87% rename from src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h index 1a99ed71..f2788a9b 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h @@ -1,8 +1,8 @@ #ifndef _CHATPACKET_H #define _CHATPACKET_H -#include -#include +#include +#include #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h similarity index 91% rename from src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h index 6e55dc76..774f87c2 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h @@ -1,7 +1,7 @@ #ifndef _EVENTFINISH_H #define _EVENTFINISH_H -#include +#include namespace Core { namespace Network { @@ -41,4 +41,4 @@ private: } } -#endif /*_EVENTFINISH_H*/ \ No newline at end of file +#endif /*_EVENTFINISH_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h similarity index 94% rename from src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h index a3505fa2..44dba83d 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h @@ -1,7 +1,7 @@ #ifndef _EVENTPLAY_H #define _EVENTPLAY_H -#include +#include #include "Forwards.h" namespace Core { @@ -52,4 +52,4 @@ private: } } -#endif /*_EVENTPLAY_H*/ \ No newline at end of file +#endif /*_EVENTPLAY_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h similarity index 93% rename from src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h index 6872fa7d..2109c856 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h @@ -1,7 +1,7 @@ #ifndef _EVENTSTART_H #define _EVENTSTART_H -#include +#include #include "Forwards.h" namespace Core { @@ -47,4 +47,4 @@ private: } } -#endif /*_EVENTSTART_H*/ \ No newline at end of file +#endif /*_EVENTSTART_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h similarity index 95% rename from src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h index d57e6685..db426e0a 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h @@ -1,8 +1,8 @@ #ifndef _CORE_NETWORK_PACKETS_INITUIPACKET_H #define _CORE_NETWORK_PACKETS_INITUIPACKET_H -#include -#include +#include +#include #include "Actor/Player.h" #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h similarity index 95% rename from src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h index 88536c0d..bee13f75 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h @@ -1,7 +1,7 @@ #ifndef _MODELEQUIPPACKET_H #define _MODELEQUIPPACKET_H -#include +#include #include "Actor/Player.h" #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h similarity index 88% rename from src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h index abc7f9d6..1771d801 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h @@ -1,9 +1,9 @@ #ifndef _MOVEACTORPACKET_H #define _MOVEACTORPACKET_H -#include -#include -#include +#include +#include +#include #include "Actor/Player.h" #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h similarity index 93% rename from src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h index 8a3e1836..88c23887 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h @@ -1,7 +1,7 @@ #ifndef _CORE_NETWORK_PACKETS_PINGPACKET_H #define _CORE_NETWORK_PACKETS_PINGPACKET_H -#include +#include #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h similarity index 96% rename from src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h index 4ee95f5b..662f9574 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h @@ -1,9 +1,9 @@ #ifndef _PLAYERSPAWN_H #define _PLAYERSPAWN_H -#include -#include -#include +#include +#include +#include #include "Actor/Player.h" #include "Forwards.h" #include "Inventory/Inventory.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h similarity index 96% rename from src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h index ac0c4826..920a4a80 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h @@ -1,7 +1,7 @@ #ifndef _PLAYERSTATE_H #define _PLAYERSTATE_H -#include +#include #include "Actor/Player.h" #include "Forwards.h" diff --git a/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h similarity index 92% rename from src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h index 1c846b11..4c462c5f 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h @@ -1,7 +1,7 @@ #ifndef _QUESTMESSAGE_H #define _QUESTMESSAGE_H -#include +#include #include "Actor/Player.h" #include "Forwards.h" @@ -40,4 +40,4 @@ private: } } -#endif /* _QUESTMESSAGE_H */ \ No newline at end of file +#endif /* _QUESTMESSAGE_H */ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h similarity index 80% rename from src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h index 07ec036e..3829598b 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h @@ -1,8 +1,8 @@ #ifndef _SERVERNOTICEPACKET_H #define _SERVERNOTICEPACKET_H -#include -#include +#include +#include #include "Forwards.h" namespace Core { @@ -35,4 +35,4 @@ private: } } -#endif /*_SERVERNOTICEPACKET_H*/ \ No newline at end of file +#endif /*_SERVERNOTICEPACKET_H*/ diff --git a/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h similarity index 89% rename from src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h rename to src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h index 927d968f..dc3d2096 100644 --- a/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h @@ -1,7 +1,7 @@ #ifndef _UPDATEHPMPTP_H #define _UPDATEHPMPTP_H -#include +#include #include #include "Forwards.h" @@ -37,4 +37,4 @@ private: } } -#endif /*_UPDATEHPMPTP_H*/ \ No newline at end of file +#endif /*_UPDATEHPMPTP_H*/ diff --git a/src/servers/Server_Zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h similarity index 100% rename from src/servers/Server_Zone/Script/NativeScriptApi.h rename to src/servers/sapphire_zone/Script/NativeScriptApi.h diff --git a/src/servers/Server_Zone/Script/NativeScriptManager.cpp b/src/servers/sapphire_zone/Script/NativeScriptManager.cpp similarity index 100% rename from src/servers/Server_Zone/Script/NativeScriptManager.cpp rename to src/servers/sapphire_zone/Script/NativeScriptManager.cpp diff --git a/src/servers/Server_Zone/Script/NativeScriptManager.h b/src/servers/sapphire_zone/Script/NativeScriptManager.h similarity index 97% rename from src/servers/Server_Zone/Script/NativeScriptManager.h rename to src/servers/sapphire_zone/Script/NativeScriptManager.h index 43db0d76..eed78851 100644 --- a/src/servers/Server_Zone/Script/NativeScriptManager.h +++ b/src/servers/sapphire_zone/Script/NativeScriptManager.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include "ScriptLoader.h" @@ -72,4 +72,4 @@ namespace Scripting { } } -#endif \ No newline at end of file +#endif diff --git a/src/servers/Server_Zone/Script/ScriptInfo.h b/src/servers/sapphire_zone/Script/ScriptInfo.h similarity index 100% rename from src/servers/Server_Zone/Script/ScriptInfo.h rename to src/servers/sapphire_zone/Script/ScriptInfo.h diff --git a/src/servers/Server_Zone/Script/ScriptLoader.cpp b/src/servers/sapphire_zone/Script/ScriptLoader.cpp similarity index 98% rename from src/servers/Server_Zone/Script/ScriptLoader.cpp rename to src/servers/sapphire_zone/Script/ScriptLoader.cpp index b480e06e..81b9abfe 100644 --- a/src/servers/Server_Zone/Script/ScriptLoader.cpp +++ b/src/servers/sapphire_zone/Script/ScriptLoader.cpp @@ -1,7 +1,7 @@ #include "ScriptLoader.h" -#include -#include +#include +#include #include "ServerZone.h" #include @@ -189,4 +189,4 @@ void Core::Scripting::ScriptLoader::findScripts( std::set< Core::Scripting::Scri scripts.insert( it->second ); } } -} \ No newline at end of file +} diff --git a/src/servers/Server_Zone/Script/ScriptLoader.h b/src/servers/sapphire_zone/Script/ScriptLoader.h similarity index 100% rename from src/servers/Server_Zone/Script/ScriptLoader.h rename to src/servers/sapphire_zone/Script/ScriptLoader.h diff --git a/src/servers/Server_Zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp similarity index 99% rename from src/servers/Server_Zone/Script/ScriptManager.cpp rename to src/servers/sapphire_zone/Script/ScriptManager.cpp index 93210400..d475639c 100644 --- a/src/servers/Server_Zone/Script/ScriptManager.cpp +++ b/src/servers/sapphire_zone/Script/ScriptManager.cpp @@ -1,5 +1,6 @@ -#include -#include +#include +#include +#include #include "NativeScriptManager.h" @@ -19,7 +20,6 @@ #include #include -#include // enable the ambiguity fix for every platform to avoid #define nonsense #define WIN_AMBIGUITY_FIX diff --git a/src/servers/Server_Zone/Script/ScriptManager.h b/src/servers/sapphire_zone/Script/ScriptManager.h similarity index 98% rename from src/servers/Server_Zone/Script/ScriptManager.h rename to src/servers/sapphire_zone/Script/ScriptManager.h index f87d434f..958412a0 100644 --- a/src/servers/Server_Zone/Script/ScriptManager.h +++ b/src/servers/sapphire_zone/Script/ScriptManager.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "Forwards.h" namespace Core diff --git a/src/servers/Server_Zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp similarity index 95% rename from src/servers/Server_Zone/ServerZone.cpp rename to src/servers/sapphire_zone/ServerZone.cpp index eccb7ea4..d97a7d33 100644 --- a/src/servers/Server_Zone/ServerZone.cpp +++ b/src/servers/sapphire_zone/ServerZone.cpp @@ -1,22 +1,22 @@ #include "ServerZone.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "Network/GameConnection.h" #include "Session.h" diff --git a/src/servers/Server_Zone/ServerZone.h b/src/servers/sapphire_zone/ServerZone.h similarity index 97% rename from src/servers/Server_Zone/ServerZone.h rename to src/servers/sapphire_zone/ServerZone.h index 724f031e..64db1136 100644 --- a/src/servers/Server_Zone/ServerZone.h +++ b/src/servers/sapphire_zone/ServerZone.h @@ -1,7 +1,7 @@ #ifndef __GAMESERVER_H #define __GAMESERVER_H -#include +#include #include #include diff --git a/src/servers/Server_Zone/Session.cpp b/src/servers/sapphire_zone/Session.cpp similarity index 97% rename from src/servers/Server_Zone/Session.cpp rename to src/servers/sapphire_zone/Session.cpp index 03965da3..bef1b516 100644 --- a/src/servers/Server_Zone/Session.cpp +++ b/src/servers/sapphire_zone/Session.cpp @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include #include "Network/GameConnection.h" #include "Session.h" diff --git a/src/servers/Server_Zone/Session.h b/src/servers/sapphire_zone/Session.h similarity index 100% rename from src/servers/Server_Zone/Session.h rename to src/servers/sapphire_zone/Session.h diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp similarity index 94% rename from src/servers/Server_Zone/StatusEffect/StatusEffect.cpp rename to src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp index 6a4d439c..1a4063f8 100644 --- a/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp +++ b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffect.h b/src/servers/sapphire_zone/StatusEffect/StatusEffect.h similarity index 100% rename from src/servers/Server_Zone/StatusEffect/StatusEffect.h rename to src/servers/sapphire_zone/StatusEffect/StatusEffect.h diff --git a/src/servers/Server_Zone/Zone/Cell.cpp b/src/servers/sapphire_zone/Zone/Cell.cpp similarity index 100% rename from src/servers/Server_Zone/Zone/Cell.cpp rename to src/servers/sapphire_zone/Zone/Cell.cpp diff --git a/src/servers/Server_Zone/Zone/Cell.h b/src/servers/sapphire_zone/Zone/Cell.h similarity index 100% rename from src/servers/Server_Zone/Zone/Cell.h rename to src/servers/sapphire_zone/Zone/Cell.h diff --git a/src/servers/Server_Zone/Zone/CellHandler.h b/src/servers/sapphire_zone/Zone/CellHandler.h similarity index 100% rename from src/servers/Server_Zone/Zone/CellHandler.h rename to src/servers/sapphire_zone/Zone/CellHandler.h diff --git a/src/servers/Server_Zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp similarity index 97% rename from src/servers/Server_Zone/Zone/Zone.cpp rename to src/servers/sapphire_zone/Zone/Zone.cpp index 9da356eb..c1b6dbc6 100644 --- a/src/servers/Server_Zone/Zone/Zone.cpp +++ b/src/servers/sapphire_zone/Zone/Zone.cpp @@ -1,16 +1,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Zone.h" #include "ZoneMgr.h" diff --git a/src/servers/Server_Zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h similarity index 98% rename from src/servers/Server_Zone/Zone/Zone.h rename to src/servers/sapphire_zone/Zone/Zone.h index fa318535..4ea39cb1 100644 --- a/src/servers/Server_Zone/Zone/Zone.h +++ b/src/servers/sapphire_zone/Zone/Zone.h @@ -2,7 +2,7 @@ #define _ZONE_H #include -#include +#include #include "Cell.h" #include "CellHandler.h" diff --git a/src/servers/Server_Zone/Zone/ZoneMgr.cpp b/src/servers/sapphire_zone/Zone/ZoneMgr.cpp similarity index 92% rename from src/servers/Server_Zone/Zone/ZoneMgr.cpp rename to src/servers/sapphire_zone/Zone/ZoneMgr.cpp index 100422f4..e644f4b5 100644 --- a/src/servers/Server_Zone/Zone/ZoneMgr.cpp +++ b/src/servers/sapphire_zone/Zone/ZoneMgr.cpp @@ -1,12 +1,12 @@ -#include -#include +#include +#include +#include #include #include "ZoneMgr.h" #include "Zone.h" #include "ZonePosition.h" -#include extern Core::Logger g_log; extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Zone/ZoneMgr.h b/src/servers/sapphire_zone/Zone/ZoneMgr.h similarity index 100% rename from src/servers/Server_Zone/Zone/ZoneMgr.h rename to src/servers/sapphire_zone/Zone/ZoneMgr.h diff --git a/src/servers/Server_Zone/Zone/ZonePosition.cpp b/src/servers/sapphire_zone/Zone/ZonePosition.cpp similarity index 100% rename from src/servers/Server_Zone/Zone/ZonePosition.cpp rename to src/servers/sapphire_zone/Zone/ZonePosition.cpp diff --git a/src/servers/Server_Zone/Zone/ZonePosition.h b/src/servers/sapphire_zone/Zone/ZonePosition.h similarity index 94% rename from src/servers/Server_Zone/Zone/ZonePosition.h rename to src/servers/sapphire_zone/Zone/ZonePosition.h index 0b4cad7c..89177d6e 100644 --- a/src/servers/Server_Zone/Zone/ZonePosition.h +++ b/src/servers/sapphire_zone/Zone/ZonePosition.h @@ -1,7 +1,7 @@ #ifndef _ZONELINE_H #define _ZONELINE_H -#include +#include namespace Core { diff --git a/src/servers/Server_Zone/mainGameServer.cpp b/src/servers/sapphire_zone/mainGameServer.cpp similarity index 100% rename from src/servers/Server_Zone/mainGameServer.cpp rename to src/servers/sapphire_zone/mainGameServer.cpp diff --git a/src/tools/exd_common_gen/CMakeLists.txt b/src/tools/exd_common_gen/CMakeLists.txt index 986a5342..ee45df8a 100644 --- a/src/tools/exd_common_gen/CMakeLists.txt +++ b/src/tools/exd_common_gen/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(exd_common_gen PROPERTIES ) if (UNIX) - target_link_libraries (exd_common_gen Common xivdat pthread mysqlclient dl z) + target_link_libraries (exd_common_gen common xivdat pthread mysqlclient dl z) else() - target_link_libraries (exd_common_gen Common xivdat libmysql zlib1) + target_link_libraries (exd_common_gen common xivdat libmysql zlib1) # ignore unchecked iterators warnings from msvc add_definitions(-D_SCL_SECURE_NO_WARNINGS) diff --git a/src/tools/exd_common_gen/main.cpp b/src/tools/exd_common_gen/main.cpp index 3e129189..2295bcfd 100644 --- a/src/tools/exd_common_gen/main.cpp +++ b/src/tools/exd_common_gen/main.cpp @@ -8,8 +8,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/tools/exd_struct_gen/CMakeLists.txt b/src/tools/exd_struct_gen/CMakeLists.txt index db111ae5..55a4f094 100644 --- a/src/tools/exd_struct_gen/CMakeLists.txt +++ b/src/tools/exd_struct_gen/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(exd_struct_gen PROPERTIES ) if (UNIX) - target_link_libraries (exd_struct_gen Common xivdat pthread mysqlclient dl z) + target_link_libraries (exd_struct_gen common xivdat pthread mysqlclient dl z) else() - target_link_libraries (exd_struct_gen Common xivdat libmysql zlib1) + target_link_libraries (exd_struct_gen common xivdat libmysql zlib1) endif() target_link_libraries(exd_struct_gen ${Boost_LIBRARIES} ${Boost_LIBRARIES}) diff --git a/src/tools/exd_struct_gen/main.cpp b/src/tools/exd_struct_gen/main.cpp index a1e51ccd..8c26137e 100644 --- a/src/tools/exd_struct_gen/main.cpp +++ b/src/tools/exd_struct_gen/main.cpp @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/tools/exd_struct_test/CMakeLists.txt b/src/tools/exd_struct_test/CMakeLists.txt index a59f5121..817c85a4 100644 --- a/src/tools/exd_struct_test/CMakeLists.txt +++ b/src/tools/exd_struct_test/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(exd_struct_test PROPERTIES ) if (UNIX) - target_link_libraries (exd_struct_test Common xivdat pthread mysqlclient dl z) + target_link_libraries (exd_struct_test common xivdat pthread mysqlclient dl z) else() - target_link_libraries (exd_struct_test Common xivdat libmysql zlib1) + target_link_libraries (exd_struct_test common xivdat libmysql zlib1) endif() target_link_libraries(exd_struct_test ${Boost_LIBRARIES} ${Boost_LIBRARIES}) diff --git a/src/tools/exd_struct_test/main.cpp b/src/tools/exd_struct_test/main.cpp index 0ba59997..a3b50104 100644 --- a/src/tools/exd_struct_test/main.cpp +++ b/src/tools/exd_struct_test/main.cpp @@ -10,7 +10,7 @@ #include #include #include "ExdDataGenerated.h" -#include +#include #include #include #include diff --git a/src/tools/pcb_reader/main.cpp b/src/tools/pcb_reader/main.cpp index 7022dbe3..91d36963 100644 --- a/src/tools/pcb_reader/main.cpp +++ b/src/tools/pcb_reader/main.cpp @@ -20,6 +20,8 @@ //#include #endif +std::string gamePath( "C:\\Program Files (x86)\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv" ); + using namespace std::chrono_literals; struct face @@ -90,7 +92,7 @@ std::string zoneNameToPath( const std::string& name ) if( inFile.good() ) { std::string line; - std::regex re("(\\d+),\"(.*)\",\"(.*)\",.*"); + std::regex re( "(\\d+),\"(.*)\",\"(.*)\",.*" ); while( std::getline( inFile, line ) ) { std::smatch match; @@ -103,18 +105,19 @@ std::string zoneNameToPath( const std::string& name ) } } } + inFile.close(); } if( !path.empty() ) { //path = path.substr( path.find_first_of( "/" ) + 1, path.size() - path.find_first_of( "/" )); - //path = std::string( "ffxiv/" ) + path; - path = std::string( "bg" ) + path.substr( 0, path.find( "/level/" ) ); + //path = std::string( "ffxiv/" ) + path; + path = std::string( "bg/" ) + path.substr( 0, path.find( "/level/" ) ); std::cout << "[Info] " << "Found path for " << name << ": " << path << std::endl; } else { throw std::runtime_error( "Unable to find path for " + name + - ".\n\tPlease open 0a0000.win32.index with FFXIV Explorer and extract territorytype.exh as CSV\n\tand copy territorytype.exh.csv into pcb_reader.exe directory" ); + ".\n\tPlease double check spelling or open 0a0000.win32.index with FFXIV Explorer and extract territorytype.exh as CSV\n\tand copy territorytype.exh.csv into pcb_reader.exe directory if using standalone" ); } return path; } @@ -125,7 +128,7 @@ void readFileToBuffer( const std::string& path, std::vector< char >& buf ) if( inFile.good() ) { inFile.seekg( 0, inFile.end ); - int32_t fileSize = inFile.tellg(); + int32_t fileSize = (int32_t)inFile.tellg(); buf.resize( fileSize ); inFile.seekg( 0, inFile.beg ); inFile.read( &buf[0], fileSize ); @@ -142,7 +145,6 @@ int main( int argc, char* argv[] ) auto startTime = std::chrono::system_clock::now(); // todo: support expansions - std::string gamePath = "C:\\Program Files (x86)\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv"; std::string zoneName = "r1f1"; if( argc > 1 ) @@ -163,10 +165,9 @@ int main( int argc, char* argv[] ) std::vector< char > section; std::vector< char > section1; - #ifndef STANDALONE +#ifndef STANDALONE xiv::dat::GameData data1( gamePath ); xiv::exd::ExdData eData( data1 ); - const xiv::dat::Cat& test = data1.get_category( "bg" ); auto test_file = data1.get_file( bgLgbPath ); @@ -174,12 +175,12 @@ int main( int argc, char* argv[] ) auto test_file1 = data1.get_file( listPcbPath ); section1 = test_file1->access_data_sections().at( 0 ); - #else +#else { readFileToBuffer( bgLgbPath, section ); readFileToBuffer( listPcbPath, section1 ); } - #endif +#endif int32_t list_offset = *( uint32_t* )§ion[0x18]; int32_t size = *( uint32_t* )§ion[4]; @@ -235,15 +236,15 @@ int main( int argc, char* argv[] ) { char* dataSection = nullptr; //std::cout << fileName << " "; - #ifndef STANDALONE +#ifndef STANDALONE auto file = data1.get_file( fileName ); auto sections = file->get_data_sections(); dataSection = §ions.at( 0 )[0]; - #else +#else std::vector< char > buf; readFileToBuffer( fileName, buf ); dataSection = &buf[0]; - #endif +#endif //std::cout << sections.size() << "\n"; uint32_t offset = 0; @@ -287,15 +288,15 @@ int main( int argc, char* argv[] ) { char* dataSection = nullptr; //std::cout << fileName << " "; - #ifndef STANDALONE +#ifndef STANDALONE auto file = data1.get_file( fileName ); auto sections = file->get_data_sections(); dataSection = §ions.at( 0 )[0]; - #else +#else std::vector< char > buf; readFileToBuffer( fileName, buf ); dataSection = &buf[0]; - #endif +#endif sgbFile = SGB_FILE( &dataSection[0] ); sgbFiles.insert( std::make_pair( fileName, sgbFile ) ); return true; diff --git a/src/tools/quest_parser/CMakeLists.txt b/src/tools/quest_parser/CMakeLists.txt index 5fd8176d..9dc1c308 100644 --- a/src/tools/quest_parser/CMakeLists.txt +++ b/src/tools/quest_parser/CMakeLists.txt @@ -30,9 +30,9 @@ set_target_properties(quest_parse PROPERTIES ) if (UNIX) - target_link_libraries (quest_parse Common xivdat pthread mysqlclient dl z) + target_link_libraries (quest_parse common xivdat pthread mysqlclient dl z) else() - target_link_libraries (quest_parse Common xivdat libmysql zlib1) + target_link_libraries (quest_parse common xivdat libmysql zlib1) endif() target_link_libraries(quest_parse ${Boost_LIBRARIES} ${Boost_LIBRARIES}) diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp index acd644ef..b3ec9928 100644 --- a/src/tools/quest_parser/main.cpp +++ b/src/tools/quest_parser/main.cpp @@ -1,38 +1,84 @@ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include #include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include Core::Logger g_log; Core::Data::ExdData g_exdData; +const std::string onTalkStr( + " void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override\n" + " {\n" + " auto actor = Event::mapEventActorToRealActor( actorId );\n" + " }\n\n" +); -void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::set< std::string > additionalList ) +const std::string onWithinRangeStr( + " void onWithinRange( uint32_t eventId, Entity::Player& player, uint64_t eRangeId, float x, float y, float z ) override\n" + " {\n" + " }\n\n" +); + +const std::string onEmoteStr( + " void onEmote( uint32_t eventId, Entity::Player& player, uint64_t actorId, uint32_t emoteId ) override\n" + " {\n" + " }\n\n" +); + +std::string titleCase( const std::string& str ) +{ + if( str.empty() ) + return str; + + std::string retStr(str); + std::transform( str.begin(), str.end(), retStr.begin(), ::tolower ); + std::locale loc; + retStr[0] = std::toupper( str[0], loc ); + for( size_t i = 1; i < str.size(); ++i ) + { + if( str[i - 1] == ' ' || str[i - 1] == '_' || ( std::isdigit( str[i - 1], loc ) && !std::isdigit( str[i], loc ) ) ) + retStr[i] = std::toupper( str[i], loc ); + } + return retStr; +} + +void createScript( boost::shared_ptr< Core::Data::QuestInfo >& pQuestData, std::set< std::string >& additionalList ) { std::string header( - "// This is an automatically generated chai script template\n" + "// This is an automatically generated C++ script template\n" "// Content needs to be added by hand to make it function\n" - "// In order for this script to be loaded, change its extension to .chai\n" - "// and move it to the correct folder in bin/scripts/chai/quest\n" + "// In order for this script to be loaded, change its extension to .cpp\n" + "// and move it to the correct folder in /scripts/native/\n" "\n" + "#include \n\n" ); - std::size_t splitPos = pQuestData->name_intern.find( "_" ); - std::string className = pQuestData->name_intern.substr( 0, splitPos ); + std::size_t splitPos( pQuestData->name_intern.find( "_" ) ); + std::string className( pQuestData->name_intern.substr( 0, splitPos ) ); + //className = "Quest" + className; + std::string sceneStr( " //////////////////////////////////////////////////////////////////////\n // Available Scenes in this quest, not necessarly all are used\n" ); + std::string seqStr; + seqStr.reserve( 0xFFF ); + seqStr += ( " // Steps in this quest ( 0 is before accepting, \n // 1 is first, 255 means ready for turning it in\n" ); + std::string questVarStr( " // Quest vars / flags used\n" ); - std::string sceneStr = " //////////////////////////////////////////////////////////////////////\n // Available Scenes in this quest, not necessarly all are used\n"; - std::string seqStr = " // Steps in this quest ( 0 is before accepting, \n // 1 is first, 255 means ready for turning it in\n"; - std::string questVarStr = " // Quest vars / flags used\n"; + seqStr += " enum Sequence : uint8_t\n {\n"; for( auto &entry : additionalList ) { if( entry.find( "OnScene" ) != std::string::npos ) @@ -43,54 +89,64 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s std::size_t numOff = sceneId.find_first_not_of( "0" ); sceneId = numOff != std::string::npos ? sceneId.substr( numOff ) : "0"; - sceneStr += " def " + sceneName + "( player )\n"; - sceneStr += " {\n"; - sceneStr += " player.eventPlay( this.id, " + sceneId + ", NONE,\n"; - sceneStr += " fun( player, eventId, param1, param2, param3 )\n"; - sceneStr += " {} );\n"; - sceneStr += " }\n\n"; + sceneStr += std::string( + " void " + + sceneName + + "( Entity::Player& player )\n" + " {\n" + " player.eventPlay( this->getId(), " + + sceneId + + ", 0,\n" + " [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 )\n" + " {\n" + " });\n" + " }\n\n" + ); } else if( entry.find( "Flag" ) != std::string::npos || entry.find( "QuestUI" ) != std::string::npos ) { - questVarStr += " // " + entry + "\n"; + questVarStr += " // " + entry + "\n"; } else if( entry.find( "SEQ" ) != std::string::npos ) { if( entry.find( "SEQ_FINISH" ) != std::string::npos ) { - seqStr += " this.SEQ_FINISH = 255;\n"; + seqStr += " SeqFinish = 255,\n"; } else if( entry.find( "SEQ_OFFER" ) != std::string::npos ) { } else { - std::string seqName = entry; + std::string seqName = titleCase( entry ); + boost::replace_all( seqName, "_", "" ); + std::string seqId = entry.substr( 4 ); - seqStr += " this." + seqName + " = " + seqId + ";\n"; + seqStr += " " + seqName + " = " + seqId + ",\n"; } } - - } - std::string rewards = " // Quest rewards \n"; - rewards += ( pQuestData->reward_exp_factor != 0 ) ? " this.RewardExpFactor = " + std::to_string( pQuestData->reward_exp_factor ) + ";\n" : ""; - rewards += ( pQuestData->reward_gil != 0 ) ? " this.RewardGil = " + std::to_string( pQuestData->reward_gil ) + ";\n" : ""; - rewards += ( pQuestData->reward_emote != 0 ) ? " this.RewardEmote = " + std::to_string( pQuestData->reward_emote ) + ";\n" : ""; - rewards += ( pQuestData->reward_action != 0 ) ? " this.RewardAction = " + std::to_string( pQuestData->reward_action ) + ";\n" : ""; - rewards += ( pQuestData->reward_action_general1 != 0 ) ? " this.RewardGeneralAction1 = " + std::to_string( pQuestData->reward_action_general1 ) + ";\n" : ""; - rewards += ( pQuestData->reward_action_general2 != 0 ) ? " this.RewardGeneralAction2 = " + std::to_string( pQuestData->reward_action_general2 ) + ";\n" : ""; - rewards += ( pQuestData->reward_gc_seals != 0 ) ? " this.RewardGCSeals = " + std::to_string( pQuestData->reward_gc_seals ) + ";\n" : ""; - rewards += ( pQuestData->reward_other != 0 ) ? " this.RewardOther = " + std::to_string( pQuestData->reward_other ) + ";\n" : ""; - rewards += ( pQuestData->reward_reputation != 0 ) ? " this.RewardReputation = " + std::to_string( pQuestData->reward_reputation ) + ";\n" : ""; - rewards += ( pQuestData->reward_tome_type != 0 ) ? " this.RewardTomeType = " + std::to_string( pQuestData->reward_tome_type ) + ";\n" : ""; - rewards += ( pQuestData->reward_tome_count != 0 ) ? " this.RewardTomeCount = " + std::to_string( pQuestData->reward_tome_count ) + ";\n" : ""; - rewards += ( pQuestData->instanced_content_unlock != 0 ) ? " this.InstancedContentUnlock = " + std::to_string( pQuestData->instanced_content_unlock ) + ";\n" : ""; + seqStr += " };\n"; + std::string rewards; + rewards.reserve( 0xFFF ); + rewards += " // Quest rewards \n"; + rewards += ( pQuestData->reward_exp_factor != 0 ) ? " static constexpr auto RewardExpFactor = " + std::to_string( pQuestData->reward_exp_factor ) + ";\n" : ""; + rewards += ( pQuestData->reward_gil != 0 ) ? " static constexpr auto RewardGil = " + std::to_string( pQuestData->reward_gil ) + ";\n" : ""; + rewards += ( pQuestData->reward_emote != 0 ) ? " static constexpr auto RewardEmote = " + std::to_string( pQuestData->reward_emote ) + ";\n" : ""; + rewards += ( pQuestData->reward_action != 0 ) ? " static constexpr auto RewardAction = " + std::to_string( pQuestData->reward_action ) + ";\n" : ""; + rewards += ( pQuestData->reward_action_general1 != 0 ) ? " static constexpr auto RewardGeneralAction1 = " + std::to_string( pQuestData->reward_action_general1 ) + ";\n" : ""; + rewards += ( pQuestData->reward_action_general2 != 0 ) ? " static constexpr auto RewardGeneralAction2 = " + std::to_string( pQuestData->reward_action_general2 ) + ";\n" : ""; + rewards += ( pQuestData->reward_gc_seals != 0 ) ? " static constexpr auto RewardGCSeals = " + std::to_string( pQuestData->reward_gc_seals ) + ";\n" : ""; + rewards += ( pQuestData->reward_other != 0 ) ? " static constexpr auto RewardOther = " + std::to_string( pQuestData->reward_other ) + ";\n" : ""; + rewards += ( pQuestData->reward_reputation != 0 ) ? " static constexpr auto RewardReputation = " + std::to_string( pQuestData->reward_reputation ) + ";\n" : ""; + rewards += ( pQuestData->reward_tome_type != 0 ) ? " static constexpr auto RewardTomeType = " + std::to_string( pQuestData->reward_tome_type ) + ";\n" : ""; + rewards += ( pQuestData->reward_tome_count != 0 ) ? " static constexpr auto RewardTomeCount = " + std::to_string( pQuestData->reward_tome_count ) + ";\n" : ""; + rewards += ( pQuestData->instanced_content_unlock != 0 ) ? " static constexpr auto InstancedContentUnlock = " + std::to_string( pQuestData->instanced_content_unlock ) + ";\n" : ""; if( pQuestData->reward_item.size() > 0 ) { - rewards += " this.RewardItem = ["; + rewards += " static constexpr auto RewardItem[] = { "; for( size_t ca = 0; ca < pQuestData->reward_item.size(); ca++ ) { rewards += std::to_string( pQuestData->reward_item.at( ca ) ); @@ -99,12 +155,12 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s rewards += ", "; } } - rewards += "];\n"; + rewards += " };\n"; } if( pQuestData->reward_item.size() > 0 ) { - rewards += " this.RewardItemCount = ["; + rewards += " static constexpr auto RewardItemCount[] = { "; for( size_t ca = 0; ca < pQuestData->reward_item_count.size(); ca++ ) { rewards += std::to_string( pQuestData->reward_item_count.at( ca ) ); @@ -113,12 +169,12 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s rewards += ", "; } } - rewards += "];\n"; + rewards += " };\n"; } if( pQuestData->reward_item_optional.size() > 0 ) { - rewards += " this.RewardItemOptional = ["; + rewards += " static constexpr auto RewardItemOptional[] = { "; for( size_t ca = 0; ca < pQuestData->reward_item_optional.size(); ca++ ) { rewards += std::to_string( pQuestData->reward_item_optional.at( ca ) ); @@ -127,12 +183,12 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s rewards += ", "; } } - rewards += "];\n"; + rewards += " };\n"; } if( pQuestData->reward_item_optional_count.size() > 0 ) { - rewards += " this.RewardItemOptionalCount = ["; + rewards += " static constexpr auto RewardItemOptionalCount[] = { "; for( size_t ca = 0; ca < pQuestData->reward_item_optional_count.size(); ca++ ) { rewards += std::to_string( pQuestData->reward_item_optional_count.at( ca ) ); @@ -141,7 +197,7 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s rewards += ", "; } } - rewards += "];\n"; + rewards += " };\n"; } bool hasERange = false; @@ -149,29 +205,30 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s bool hasEnemies = false; std::vector< uint32_t > enemy_ids; std::vector< std::string > script_entities; - std::string sentities = " // Entities found in the script data of the quest\n"; - + std::string sentities = " // Entities found in the script data of the quest\n"; + for( size_t ca = 0; ca < pQuestData->script_entity.size(); ca ++ ) { if( ( pQuestData->script_entity.at( ca ).find( "HOWTO" ) != std::string::npos ) || ( pQuestData->script_entity.at( ca ).find( "HOW_TO" ) != std::string::npos ) ) continue; - if( (pQuestData->script_entity.at( ca ).find( "EMOTENO" ) != std::string::npos ) || (pQuestData->script_entity.at( ca ).find( "EMOTEOK" ) != std::string::npos ) ) + if( ( pQuestData->script_entity.at( ca ).find( "EMOTENO" ) != std::string::npos ) || ( pQuestData->script_entity.at( ca ).find( "EMOTEOK" ) != std::string::npos ) ) hasEmote = true; - if(pQuestData->script_entity.at(ca).find("ENEMY") != std::string::npos) + if( pQuestData->script_entity.at( ca ).find( "ENEMY" ) != std::string::npos ) { hasEnemies = true; - enemy_ids.push_back(pQuestData->script_value.at(ca)); + enemy_ids.push_back( pQuestData->script_value.at( ca ) ); } - script_entities.push_back( pQuestData->script_entity.at( ca ) + " = " + std::to_string( pQuestData->script_value.at( ca ) ) ); + script_entities.push_back( pQuestData->script_entity.at( ca ) + " = " + std::to_string( pQuestData->script_value.at( ca ) ) ); } std::sort( script_entities.begin(), script_entities.end() ); - for( auto& entity : script_entities ) { - sentities += " this." + entity + ";\n"; + auto name = titleCase( entity ); + boost::replace_all( name, "_", "" ); + sentities += " static constexpr auto " + name + ";\n"; } std::string additional = "// Quest Script: " + pQuestData->name_intern + "\n"; @@ -180,78 +237,82 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s additional += "// Start NPC: " + std::to_string( pQuestData->enpc_resident_start ) + "\n"; additional += "// End NPC: " + std::to_string( pQuestData->enpc_resident_end ) + "\n\n"; - std::string scriptEntry = " //////////////////////////////////////////////////////////////////////\n"; - scriptEntry += " // Event Handlers\n"; - scriptEntry += " def onTalk( eventId, player, actorId )\n"; - scriptEntry += " {\n"; - scriptEntry += " var actor = mapActor( actorId );\n"; - scriptEntry += " }\n\n"; - + std::string scriptEntry; + scriptEntry.reserve(0xFFFF); + scriptEntry += " //////////////////////////////////////////////////////////////////////\n // Event Handlers\n"; + + scriptEntry += onTalkStr; + if( hasERange ) { - scriptEntry += " def onWithinRange( eventId, player, eRangeId, x, y, z )\n"; - scriptEntry += " {\n"; - scriptEntry += " }\n\n"; + scriptEntry += onWithinRangeStr; } - + if( hasEmote ) { - scriptEntry += " def onEmote( eventId, player, actorId, emoteId )\n"; - scriptEntry += " {\n"; - scriptEntry += " }\n\n"; + scriptEntry += onEmoteStr; } for( auto enemy : enemy_ids ) { - scriptEntry += " def onMobKill_" + std::to_string(enemy) + "( player )\n"; - scriptEntry += " {\n"; - scriptEntry += " }\n\n"; + scriptEntry += std::string( + " void onMobKill_" + std::to_string( enemy ) + "( Entity::Player& player )\n" + " {\n" + " }\n\n" + ); } - + std::string constructor; - constructor += " def " + className + "Def()\n"; - constructor += " {\n"; - constructor += " // Basic quest information \n"; - constructor += " this.name = \"" + pQuestData->name + "\";\n"; - constructor += " this.id = " + std::to_string( pQuestData->id ) + ";\n\n"; + constructor += std::string( + " private:\n" + " // Basic quest information \n"); constructor += questVarStr + "\n"; constructor += seqStr + "\n"; constructor += rewards + "\n"; constructor += sentities + "\n"; - constructor += " }\n"; - - + constructor += " public:\n"; + constructor += " " + className + "() : EventScript" + "( \"" + pQuestData->name + "\", " + std::to_string( pQuestData->id ) + " ){}; \n"; + constructor += " ~" + className + "(){}; \n"; + std::string classString( - "class " + className + "Def \n" - "{\n" - + constructor + - "\n" - + sceneStr + + "class " + className + " : public EventScript\n" + "{\n" + + constructor + + "\n" + scriptEntry + + " private:\n" + + sceneStr + "};\n\n" ); - std::string objName = className; - std::string initObj = "GLOBAL " + objName + " = " + className + "Def();\n"; + std::string initObj( "EXPORT_SCRIPTOBJECT( " + className + " );" ); std::ofstream outputFile; - outputFile.open( "generated/" + className + ".chai_generated" ); + + outputFile.open( "generated/" + className + ".cpp_generated" ); outputFile << header << additional << classString << initObj; outputFile.close(); } -int main() +int main( int argc, char** argv ) { g_log.init(); + bool unluac = false; // std::string datLocation( "/opt/sapphire_3_15_0/bin/sqpack" ); - std::string datLocation( "C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv" ); + std::string datLocation( "C:/Program Files (x86)/SquareEnix/FINAL FANTASY XIV - A Realm Reborn/game/sqpack/ffxiv" ); + if ( argc > 1 ) + datLocation = std::string( argv[1] ); + if ( argc > 2 ) + unluac = (bool)atoi( argv[2] ); g_log.info( "Setting up EXD data" ); if( !g_exdData.init( datLocation ) ) { + std::cout << datLocation << "\n"; g_log.fatal( "Error setting up EXD data " ); + std::cout << "Usage: quest_parser \"path/to/ffxiv/game/sqpack\" <1/0 unluac export toggle>\n"; return 0; } @@ -261,9 +322,14 @@ int main() auto QuestDat = g_exdData.setupDatAccess( "Quest", xiv::exd::Language::en ); auto rows = QuestDat.get_rows(); - for( auto row : rows ) + if ( !boost::filesystem::exists( "./generated" ) ) + boost::filesystem::create_directory( "./generated" ); + + std::cout << "Export in progress"; + uint32_t updateInterval = rows.size() / 20; + uint32_t i = 0; + for( const auto& row : rows ) { - auto questInfo = g_exdData.getQuestInfo( row.first ); if( questInfo->name.empty() || questInfo->name_intern.empty() ) @@ -299,23 +365,26 @@ int main() uint32_t offset = 0; std::ofstream outputFile1; - outputFile1.open("generated/" + questInfo->name_intern + ".luab", std::ios::binary); - outputFile1.write(§ion[0], section.size()); + outputFile1.open( "generated/" + questInfo->name_intern + ".luab", std::ios::binary ); + outputFile1.write( §ion[0], section.size() ); outputFile1.close(); - std::string command= std::string("java -jar unluac_2015_06_13.jar ") + "generated/" + questInfo->name_intern + ".luab" + ">> " + "generated/" + questInfo->name_intern + ".lua"; - if ( system( command.c_str() ) == -1 ) + if( unluac ) { - g_log.error( "Error executing java command:\n" + command + "\nerrno: " + std::strerror( errno ) ); - return errno; + std::string command = std::string( "java -jar unluac_2015_06_13.jar " ) + "generated/" + questInfo->name_intern + ".luab" + ">> " + "generated/" + questInfo->name_intern + ".lua"; + if ( system( command.c_str() ) == -1 ) + { + g_log.error( "Error executing java command:\n" + command + "\nerrno: " + std::strerror( errno ) ); + return errno; + } } for( ; ; ) { - + std::string entry( §ion[offset] ); offset += entry.size() + 1; - - if( entry.size() > 3 - && entry.find_first_not_of( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_" ) == std::string::npos ) + + if( entry.size() > 3 + && entry.find_first_not_of( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_-" ) == std::string::npos ) { if( entry.find( "SEQ" ) != std::string::npos || entry.find( "QuestUI" ) != std::string::npos @@ -333,8 +402,11 @@ int main() createScript( questInfo, stringList ); + ++i; + if( i % updateInterval == 0 ) + std::cout << "."; //break; } - + std::cout << "\nDone!"; return 0; }