diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index d1a11ed..daf068d 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -34,6 +34,7 @@ #include "incubator.h" #include "team.h" #include "explosion.h" +#include "killmgr.h" const int kReviveTimeAdd = 12; const int kSkinNum = 4; diff --git a/server/gameserver/human.h b/server/gameserver/human.h index ecbf752..d43e74c 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -23,6 +23,7 @@ struct PartObject }; struct xtimer_list; +struct KillInfo; class CircleCollider; class AabbCollider; class Obstacle; diff --git a/server/gameserver/killmgr.cc b/server/gameserver/killmgr.cc new file mode 100644 index 0000000..ee30b7f --- /dev/null +++ b/server/gameserver/killmgr.cc @@ -0,0 +1,13 @@ +#include "precompile.h" + +#include "killmgr.h" + +void KillMgr::Init() +{ + +} + +void KillMgr::UnInit() +{ + +} diff --git a/server/gameserver/killmgr.h b/server/gameserver/killmgr.h new file mode 100644 index 0000000..26d9c8e --- /dev/null +++ b/server/gameserver/killmgr.h @@ -0,0 +1,24 @@ +#pragma once + +#include + +struct KillInfo +{ + int killer_id = 0; + int killer_team_id = 0; + int weapon_id = 0; + std::string msg; +}; + +class KillMgr : public a8::Singleton +{ + + private: + KillMgr() {}; + friend class a8::Singleton; + + public: + + void Init(); + void UnInit(); +}; diff --git a/server/gameserver/types.h b/server/gameserver/types.h index 8f5f7b8..a68bc22 100644 --- a/server/gameserver/types.h +++ b/server/gameserver/types.h @@ -154,14 +154,6 @@ struct ObstacleData std::map>* interaction_humans = nullptr; }; -struct KillInfo -{ - int killer_id = 0; - int killer_team_id = 0; - int weapon_id = 0; - std::string msg; -}; - struct Inventory { int slot = 0;