From 3b4fafd137687daf0a3499e49cefad53f5139964 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 26 Dec 2022 18:31:23 +0800 Subject: [PATCH] 1 --- server/gameserver/attrhelper.cc | 1 - server/gameserver/handlermgr.cc | 1 + server/gameserver/httpproxy.cc | 1 + server/gameserver/human.h | 5 +++++ third_party/f8 | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/gameserver/attrhelper.cc b/server/gameserver/attrhelper.cc index 34d709ee..acd49763 100644 --- a/server/gameserver/attrhelper.cc +++ b/server/gameserver/attrhelper.cc @@ -28,7 +28,6 @@ bool AttrHelper::ParseAttr(std::shared_ptr xobj, std::shared_ptr obj = xobj->At(i); if (obj->IsObject()) { int attr_id = obj->Get("attr_id", 0); - int type = obj->Get("type", 0); int val = obj->Get("val", 0); { float* p = GetAttrAbsPtr(attr_abs, attr_id); diff --git a/server/gameserver/handlermgr.cc b/server/gameserver/handlermgr.cc index d461d617..3b7ce722 100644 --- a/server/gameserver/handlermgr.cc +++ b/server/gameserver/handlermgr.cc @@ -4,6 +4,7 @@ #include #include +#include #include "handlermgr.h" diff --git a/server/gameserver/httpproxy.cc b/server/gameserver/httpproxy.cc index f05046ee..000caf2b 100644 --- a/server/gameserver/httpproxy.cc +++ b/server/gameserver/httpproxy.cc @@ -4,6 +4,7 @@ #include #include +#include #include "httpproxy.h" #include "app.h" diff --git a/server/gameserver/human.h b/server/gameserver/human.h index a4a75c2c..5788f8a4 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -18,6 +18,11 @@ namespace cs class SMUpdate; } +namespace a8 +{ + class MutableXObject; +} + struct HumanBehavior { long long curr_start_destory_box_frameno = 0; diff --git a/third_party/f8 b/third_party/f8 index 558c4343..b64621b7 160000 --- a/third_party/f8 +++ b/third_party/f8 @@ -1 +1 @@ -Subproject commit 558c4343d337d178932ab36bafcd8b6357cac216 +Subproject commit b64621b7b5f53549bb6284d51abb9c3d62e1738f