From d52daccd9428a283cdabe73f5582943c10b37b73 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 7 Jun 2019 22:59:32 +0800 Subject: [PATCH] human add movement --- server/gameserver/human.cc | 5 +++++ server/gameserver/human.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index c0223fb..f486305 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -15,6 +15,7 @@ #include "app.h" #include "roommgr.h" #include "android.h" +#include "movement.h" #include "framework/cpp/utils.h" #include "framework/cpp/httpclientpool.h" @@ -50,6 +51,8 @@ Human::Human():Entity() Human::~Human() { + delete movement ; + movement = nullptr; } void Human::Initialize() @@ -59,6 +62,8 @@ void Human::Initialize() RecalcSelfCollider(); volume_ = meta->volume; observers_.insert(this); + movement = new MovementComponent(); + movement->owner = this; } float Human::GetSpeed() diff --git a/server/gameserver/human.h b/server/gameserver/human.h index dc55c47..c684a8f 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -30,6 +30,7 @@ enum HumanStatus struct xtimer_list; class CircleCollider; class Obstacle; +class MovementComponent; class Human : public Entity { public: @@ -219,6 +220,7 @@ protected: std::set observers_; Human* follow_target_ = nullptr; bool follow_synced_active_player = false; + MovementComponent* movement = nullptr; private: CircleCollider* self_collider_ = nullptr;