diff --git a/server/gameserver/commands.cc b/server/gameserver/commands.cc index 1e3fe01b..86920222 100644 --- a/server/gameserver/commands.cc +++ b/server/gameserver/commands.cc @@ -88,9 +88,12 @@ void Player::_CMExecCommand(f8::MsgHdr* hdr, const cs::CMExecCommand& msg) } else if (cmd == "chiji") { #if MYDEBUG if (room->IsMobaModeRoom()) { - while (!room->GetVictoryTeam()) { + while (GetTeam()->GetKillCount() <100) { GetTeam()->IncKillCount(); } + if (!room->moba_over_timer.expired()) { + room->xtimer.ModifyTime(room->moba_over_timer, 0); + } } else { room->debug_params[119] = 1; room->xtimer.SetTimeoutEx diff --git a/server/gameserver/ingamevoice.cc b/server/gameserver/ingamevoice.cc new file mode 100644 index 00000000..e69de29b diff --git a/server/gameserver/ingamevoice.h b/server/gameserver/ingamevoice.h new file mode 100644 index 00000000..e69de29b diff --git a/server/gameserver/room.h b/server/gameserver/room.h index ca5bd078..57c3a346 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -45,6 +45,7 @@ class CustomBattle; class CustomMember; class RoomAgent; class RoomOb; +class InGameVoice; struct Plane { @@ -291,6 +292,7 @@ public: std::shared_ptr GetRoomOb(); void SendSMTeamFull(Human* hum); void OnTeamPartChg(Human* hum); + std::shared_ptr GetInGameVoice() { return ingame_voice_; } private: void ShuaAndroid(); @@ -443,6 +445,8 @@ private: RoomAgent* room_agent_; + std::shared_ptr ingame_voice_; + friend class Incubator; friend class Team; };