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

1

Browse Source
This commit is contained in:
aozhiwei 2020-05-29 14:30:35 +08:00
parent 3365577f52
commit 6520fa4697
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/gameserver/room.cc
View File

@ -80,17 +80,11 @@ void Room::UnInit()
void Room::Update(int delta_time) void Room::Update(int delta_time)
{ {
#ifdef DEBUG
run_in_timer_ = true;
#endif
xtimer.Update(); xtimer.Update();
if (IsGameOver() && GetFrameNo() - game_over_frameno_ > SERVER_FRAME_RATE * 20) { if (IsGameOver() && GetFrameNo() - game_over_frameno_ > SERVER_FRAME_RATE * 20) {
return; return;
} }
#ifdef DEBUG
run_in_timer_ = false;
#endif
elapsed_time_ += delta_time; elapsed_time_ += delta_time;
while (elapsed_time_ >= 50) { while (elapsed_time_ >= 50) {
if (GetFrameNo() % 2 == 0) { if (GetFrameNo() % 2 == 0) {
@ -1794,11 +1788,9 @@ long long Room::GetGasInactiveTime()
void Room::EnableHuman(Human* target) void Room::EnableHuman(Human* target)
{ {
#ifdef DEBUG if (!RuningInTimer()) {
if (!run_in_timer_) {
abort(); abort();
} }
#endif
#ifdef DEBUG #ifdef DEBUG
CheckPartObjects(); CheckPartObjects();
a8::UdpLog::Instance()->Debug("enablehuman %d %d", a8::UdpLog::Instance()->Debug("enablehuman %d %d",
@ -1826,11 +1818,9 @@ void Room::EnableHuman(Human* target)
void Room::DisableHuman(Human* target) void Room::DisableHuman(Human* target)
{ {
#ifdef DEBUG if (!RuningInTimer()) {
if (!run_in_timer_) {
abort(); abort();
} }
#endif
#ifdef DEBUG #ifdef DEBUG
CheckPartObjects(); CheckPartObjects();
a8::UdpLog::Instance()->Debug("disablehuman %d %d", a8::UdpLog::Instance()->Debug("disablehuman %d %d",
@ -2393,6 +2383,11 @@ void Room::CheckAliveHuman(Human* hum, std::vector<Human*>& alive_humans)
} }
} }
bool Room::RuningInTimer()
{
return xtimer.GetRunningTimer() != nullptr;
}
#ifdef DEBUG #ifdef DEBUG
void Room::InitDebugInfo() void Room::InitDebugInfo()
{ {

6
server/gameserver/room.h
View File

@ -43,7 +43,7 @@ public:
FrameEvent frame_event; FrameEvent frame_event;
FrameMaker frame_maker; FrameMaker frame_maker;
a8::XTimer xtimer; a8::XTimer xtimer;
a8::XTimerAttacher timer_attacher; a8::TimerAttacher timer_attacher;
GridService* grid_service = nullptr; GridService* grid_service = nullptr;
MapService* map_service = nullptr; MapService* map_service = nullptr;
RoomType_e room_type = RT_NewBrid; RoomType_e room_type = RT_NewBrid;
@ -113,6 +113,7 @@ public:
void ShuaNewBieAndroid(Human* target); void ShuaNewBieAndroid(Human* target);
void InitAirDrop(); void InitAirDrop();
void CheckPartObjects(Human* testa = nullptr, Human* testb = nullptr); void CheckPartObjects(Human* testa = nullptr, Human* testb = nullptr);
bool RuningInTimer();
private: private:
int AllocUniid(); int AllocUniid();
@ -197,7 +198,4 @@ private:
std::map<int, Human*> removed_robot_hash_; std::map<int, Human*> removed_robot_hash_;
std::vector<ObstacleData> obstacle_datas_; std::vector<ObstacleData> obstacle_datas_;
#ifdef DEBUG
bool run_in_timer_ = false;
#endif
}; };