From 2823078b694d7a81e6904d788ec6ca96c0912a6c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 23 May 2020 07:33:55 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 17 ----------------- server/gameserver/room.h | 4 ---- server/gameserver/types.h | 1 - 3 files changed, 22 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 18eff83..8ace7a9 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -136,11 +136,6 @@ int Room::AliveCount() return alive_count_; } -int Room::ActiveCount() -{ - return active_count_; -} - void Room::AddPlayer(Player* hum) { assert(gas_data.gas_mode == GasInactive); @@ -1870,15 +1865,3 @@ void Room::ProcDieAndroid(int die_time, int die_num) } } } - -void Room::IncActiveCount() -{ - ++active_count_; - ++App::Instance()->perf.active_count; -} - -void Room::DecActiveCount() -{ - --active_count_; - --App::Instance()->perf.active_count; -} diff --git a/server/gameserver/room.h b/server/gameserver/room.h index 1e55f05..1a93a1c 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -75,7 +75,6 @@ public: int AliveCount(); inline int RealAliveCount() { return real_alive_count_; } inline void IncRealAliveCount() { ++real_alive_count_stat_; } - int ActiveCount(); Player* GetPlayerByAccountId(const std::string& accountid); Player* GetPlayerByUniId(int uniid); Entity* GetEntityByUniId(int uniid); @@ -164,15 +163,12 @@ private: void DieAndroidTimerFunc(); void ProcShuaAndroid(int shua_time, int shua_num); void ProcDieAndroid(int die_time, int die_num); - void IncActiveCount(); - void DecActiveCount(); private: int elapsed_time_ = 0; int alive_count_ = 0; int real_alive_count_ = 0; int real_alive_count_stat_ = 0; - int active_count_ = 0; int force_shua_android_times_ = 0; MetaData::AirLine* airline_ = nullptr; a8::XTimerAttacher xtimer_attacher_; diff --git a/server/gameserver/types.h b/server/gameserver/types.h index a96f72c..f08b87b 100755 --- a/server/gameserver/types.h +++ b/server/gameserver/types.h @@ -12,7 +12,6 @@ struct PerfMonitor long long test_times = 0; long long alive_count = 0; long long real_alive_count = 0; - long long active_count = 0; std::array params = {}; std::array entity_num = {}; };