server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-06-21 23:14:00 +08:00
parent ab8db13131
commit e5f524d1c8
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/android_agent.cc
View File

@ -16,12 +16,6 @@
#include "mt/Robot.h" #include "mt/Robot.h"
template<typename T>
static auto SpToWp(std::shared_ptr<T> sp)
{
return std::weak_ptr<T>(sp);
}
AndroidAgent::AndroidAgent():BaseAgent() AndroidAgent::AndroidAgent():BaseAgent()
{ {
@ -67,7 +61,7 @@ behaviac::EBTStatus AndroidAgent::DoRandomWalk()
GetOwner()->GetTrigger()->AddListener GetOwner()->GetTrigger()->AddListener
( (
kAttacked, kAttacked,
[context_wp = SpToWp(context)] (const a8::Args& args) [context_wp = a8::SpToWp(context)] (const a8::Args& args)
{ {
if (!context_wp.expired()) { if (!context_wp.expired()) {
auto context = context_wp.lock(); auto context = context_wp.lock();

8
server/gameserver/base_agent.cc
View File

@ -19,12 +19,6 @@
#include "mt/Hero.h" #include "mt/Hero.h"
#include "mt/Param.h" #include "mt/Param.h"
template<typename T>
static auto SpToWp(std::shared_ptr<T> sp)
{
return std::weak_ptr<T>(sp);
}
void DumpBt(BaseAgent* agent) void DumpBt(BaseAgent* agent)
{ {
static std::string last_bt_name; static std::string last_bt_name;
@ -264,7 +258,7 @@ behaviac::EBTStatus BaseAgent::DoIdle(int min_time, int max_time)
GetOwner()->GetTrigger()->AddListener GetOwner()->GetTrigger()->AddListener
( (
kAttacked, kAttacked,
[context_wp = SpToWp(context)] (const a8::Args& args) [context_wp = a8::SpToWp(context)] (const a8::Args& args)
{ {
if (!context_wp.expired()) { if (!context_wp.expired()) {
auto context = context_wp.lock(); auto context = context_wp.lock();

9
server/gameserver/base_agent.h
View File

@ -18,6 +18,15 @@ context->owner = owner; \
return context; \ return context; \
}(GetOwner()->GetWeakPtrRef(), this) }(GetOwner()->GetWeakPtrRef(), this)
namespace a8
{
template<typename T>
static auto SpToWp(std::shared_ptr<T> sp)
{
return std::weak_ptr<T>(sp);
}
}
struct BtCoroutine; struct BtCoroutine;
class Creature; class Creature;
class BaseAgent : public behaviac::Agent class BaseAgent : public behaviac::Agent

6
server/gameserver/hero_agent.cc
View File

@ -18,12 +18,6 @@
#include "mt/Map.h" #include "mt/Map.h"
#include "mt/Hero.h" #include "mt/Hero.h"
template<typename T>
static auto SpToWp(std::shared_ptr<T> sp)
{
return std::weak_ptr<T>(sp);
}
HeroAgent::HeroAgent():BaseAgent() HeroAgent::HeroAgent():BaseAgent()
{ {