diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc index 6f791260..6388965f 100644 --- a/server/gameserver/app.cc +++ b/server/gameserver/app.cc @@ -203,7 +203,7 @@ bool App::Init(int argc, char* argv[]) f8::UdpLog::Instance()->Info("gameserver starting instance_id:%d pid:%d debug_mode:%d channel:%d", { - instance_id_, + instance_id_, getpid(), debug_mode, JsonDataMgr::Instance()->channel @@ -226,7 +226,7 @@ bool App::Init(int argc, char* argv[]) [] (int event, const a8::Args* args) { if (a8::TIMER_EXEC_EVENT == event) { - App::Instance()->terminated_ = true; + App::Instance()->Terminate(); } } ); diff --git a/server/gameserver/mt/SkillNumber.cc b/server/gameserver/mt/SkillNumber.cc index e0b9ae57..b7f13f15 100644 --- a/server/gameserver/mt/SkillNumber.cc +++ b/server/gameserver/mt/SkillNumber.cc @@ -165,8 +165,8 @@ namespace mt abort(); } #ifdef DEBUG - if (App::Instance()->instance_id == 600 || - App::Instance()->instance_id == 100) { + if (App::Instance()->GetInstanceId() == 600 || + App::Instance()->GetInstanceId() == 100) { _float_cd = 6; } #endif