diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index e74a7f90..41fac2b3 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -19,7 +19,8 @@ set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -D include_directories( AFTER - ../../third_party/a8engine + ../../third_party/a8 + ../../third_party/f8 /usr/include/mysql /usr/include/jsoncpp /usr/include/hiredis @@ -41,15 +42,15 @@ link_directories( ../../third_party/behaviac/lib/${LIB_DIR} ) -aux_source_directory(../../third_party/a8engine/a8 +aux_source_directory(../../third_party/a8/a8 SRC_LIST ) -aux_source_directory(../../third_party/framework/cpp +aux_source_directory(../../third_party/f8/f8 SRC_LIST ) -list(REMOVE_ITEM SRC_LIST "../../third_party/framework/cpp/im_msgid.pb.cc") -list(REMOVE_ITEM SRC_LIST "../../third_party/framework/cpp/im_proto.pb.cc") +list(REMOVE_ITEM SRC_LIST "../../third_party/f8/f8/im_msgid.pb.cc") +list(REMOVE_ITEM SRC_LIST "../../third_party/f8/f8/im_proto.pb.cc") aux_source_directory(../../third_party/recastnavigation/Recast/Source SRC_LIST diff --git a/server/gameserver/GGListener.cc b/server/gameserver/GGListener.cc index 11f58c39..ebd20c49 100644 --- a/server/gameserver/GGListener.cc +++ b/server/gameserver/GGListener.cc @@ -4,8 +4,8 @@ #include #include -#include "framework/cpp/netmsghandler.h" -#include "framework/cpp/msgqueue.h" +#include "f8/netmsghandler.h" +#include "f8/msgqueue.h" #include "app.h" #include "GGListener.h" diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index 498e0df7..1b0b3545 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -7,7 +7,7 @@ #include "android_agent.h" #include "movehelper.h" -#include "framework/cpp/btmgr.h" +#include "f8/btmgr.h" Android::Android():Human() { diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc index ad8b34bc..59f381b8 100644 --- a/server/gameserver/app.cc +++ b/server/gameserver/app.cc @@ -12,7 +12,7 @@ #include #include -#include "framework/cpp/netmsghandler.h" +#include "f8/netmsghandler.h" #include "app.h" #include "jsondatamgr.h" @@ -30,10 +30,10 @@ #include "ss_msgid.pb.h" #include "ss_proto.pb.h" -#include "framework/cpp/msgqueue.h" -#include "framework/cpp/tglog.h" -#include "framework/cpp/httpclientpool.h" -#include "framework/cpp/btmgr.h" +#include "f8/msgqueue.h" +#include "f8/tglog.h" +#include "f8/httpclientpool.h" +#include "f8/btmgr.h" #include "collider.h" diff --git a/server/gameserver/base_agent.cc b/server/gameserver/base_agent.cc index 2c506675..1a856f34 100644 --- a/server/gameserver/base_agent.cc +++ b/server/gameserver/base_agent.cc @@ -6,7 +6,7 @@ #include "human.h" #include "movehelper.h" -#include "framework/cpp/btmgr.h" +#include "f8/btmgr.h" void DumpBt(BaseAgent* agent) { diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 2609da0b..a53728a5 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -17,7 +17,7 @@ #include "shot.h" #include "movehelper.h" -#include "framework/cpp/utils.h" +#include "f8/utils.h" static int GetTraceTargetId(Creature* c) { diff --git a/server/gameserver/gamelog.cc b/server/gameserver/gamelog.cc index 9bac5719..f04e2361 100644 --- a/server/gameserver/gamelog.cc +++ b/server/gameserver/gamelog.cc @@ -1,7 +1,7 @@ #include "precompile.h" #include "gamelog.h" -#include "framework/cpp/utils.h" -#include "framework/cpp/tglog.h" +#include "f8/utils.h" +#include "f8/tglog.h" #include #include "player.h" #include "app.h" diff --git a/server/gameserver/handlermgr.h b/server/gameserver/handlermgr.h index e6cb7ec6..7e3b8c08 100644 --- a/server/gameserver/handlermgr.h +++ b/server/gameserver/handlermgr.h @@ -2,7 +2,7 @@ #include -#include "framework/cpp/netmsghandler.h" +#include "f8/netmsghandler.h" namespace a8 { diff --git a/server/gameserver/httpproxy.cc b/server/gameserver/httpproxy.cc index 42552ad2..16df1775 100644 --- a/server/gameserver/httpproxy.cc +++ b/server/gameserver/httpproxy.cc @@ -8,7 +8,7 @@ #include "jsondatamgr.h" #include "handlermgr.h" -#include "framework/cpp/httpclientpool.h" +#include "f8/httpclientpool.h" struct HttpProxyRequest { diff --git a/server/gameserver/httpproxy.h b/server/gameserver/httpproxy.h index b4cdb47d..33681435 100644 --- a/server/gameserver/httpproxy.h +++ b/server/gameserver/httpproxy.h @@ -1,6 +1,6 @@ #pragma once -#include "framework/cpp/httpclientpool.h" +#include "f8/httpclientpool.h" struct HttpProxyRequest; class HttpProxy : public a8::Singleton diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 2e677d4e..53bd0f5b 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -6,7 +6,7 @@ #include #include -#include "framework/cpp/utils.h" +#include "f8/utils.h" #include "human.h" #include "cs_proto.pb.h" diff --git a/server/gameserver/jsondatamgr.cc b/server/gameserver/jsondatamgr.cc index 763bae54..74a00243 100644 --- a/server/gameserver/jsondatamgr.cc +++ b/server/gameserver/jsondatamgr.cc @@ -3,7 +3,7 @@ #include "jsondatamgr.h" #include "app.h" -#include "framework/cpp/utils.h" +#include "f8/utils.h" void JsonDataMgr::Init() { diff --git a/server/gameserver/matchmgr.cc b/server/gameserver/matchmgr.cc index 1f21e54a..c45d7a03 100644 --- a/server/gameserver/matchmgr.cc +++ b/server/gameserver/matchmgr.cc @@ -7,7 +7,7 @@ #include "GGListener.h" #include "matchteam.h" -#include "framework/cpp/utils.h" +#include "f8/utils.h" void MatchMgr::Init() { diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc index 481a739a..b37e9dc7 100644 --- a/server/gameserver/matchteam.cc +++ b/server/gameserver/matchteam.cc @@ -8,7 +8,7 @@ #include "metamgr.h" #include "roommgr.h" -#include "framework/cpp/utils.h" +#include "f8/utils.h" RawTeamMember::RawTeamMember() { diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc index ef86a2de..0e639a8d 100644 --- a/server/gameserver/metadata.cc +++ b/server/gameserver/metadata.cc @@ -6,7 +6,7 @@ #include "metamgr.h" #include "skillhelper.h" -#include "framework/cpp/utils.h" +#include "f8/utils.h" namespace MetaData { diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc index fa183320..d2b31d9a 100644 --- a/server/gameserver/playermgr.cc +++ b/server/gameserver/playermgr.cc @@ -8,7 +8,7 @@ #include "metamgr.h" #include "matchmgr.h" -#include "framework/cpp/utils.h" +#include "f8/utils.h" void PlayerMgr::Init() { diff --git a/server/gameserver/precompile.h b/server/gameserver/precompile.h index 2aa8b558..8dd02626 100644 --- a/server/gameserver/precompile.h +++ b/server/gameserver/precompile.h @@ -28,6 +28,6 @@ namespace google } } -#include "framework/cpp/types.h" -#include "framework/cpp/protoutils.h" +#include "f8/types.h" +#include "f8/protoutils.h" diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index ca346ba3..667e22dc 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -8,7 +8,7 @@ #include #include -#include "framework/cpp/utils.h" +#include "f8/utils.h" #include "playermgr.h" #include "player.h" diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 6c0b052a..9af3e694 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -19,8 +19,8 @@ #include "matchteam.h" #include "httpproxy.h" -#include "framework/cpp/httpclientpool.h" -#include "framework/cpp/utils.h" +#include "f8/httpclientpool.h" +#include "f8/utils.h" const int ROOM_NUM_UP_LIMIT = 1000; const int HUM_NUM_DOWN_LIMIT = 2500; diff --git a/third_party/f8 b/third_party/f8 index 1dbae08b..37c1840e 160000 --- a/third_party/f8 +++ b/third_party/f8 @@ -1 +1 @@ -Subproject commit 1dbae08b6f5d9e4df8325f5170a2355953ff4db8 +Subproject commit 37c1840e2e58fd84267cbd4a6d5dfc2d2bcc5478