From 793918631d50fa072ee38d56f486abd988e65c32 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 12 Apr 2021 10:32:37 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 12 ++++++------ server/gameserver/room.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 83b6ef1..0adeb2a 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -86,9 +86,9 @@ void Room::Init() CreateDropObjs(); InitObstacleDatas(); ShuaAndroid(); - refresh_rule_ = new Incubator(); - refresh_rule_->room = this; - refresh_rule_->Init(); + incubator_ = new Incubator(); + incubator_->room = this; + incubator_->Init(); if (room_type_ == RT_NewBrid && creator_game_times_ <= 0) { CreateLevel0RoomSpecThings(); } @@ -99,12 +99,12 @@ void Room::Init() void Room::UnInit() { - refresh_rule_->UnInit(); + incubator_->UnInit(); #ifdef DEBUG UnInitDebugInfo(); #endif - refresh_rule_->UnInit(); - A8_SAFE_DELETE(refresh_rule_); + incubator_->UnInit(); + A8_SAFE_DELETE(incubator_); timer_attacher.ClearTimerList(); xtimer_attacher_.ClearTimerList(); for (auto& pair : accountid_hash_) { diff --git a/server/gameserver/room.h b/server/gameserver/room.h index 66ff994..0e3977e 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -320,7 +320,7 @@ private: xtimer_list* auto_jump_timer_ = nullptr; - Incubator* refresh_rule_ = nullptr; + Incubator* incubator_ = nullptr; friend class Incubator; };