incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't allow toggling spectator flag in a spectator team

Browse Source
This commit is contained in:
Martin Michelsen
2023-09-17 20:47:58 -07:00
parent 4575adea11
commit 8952a4d56b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ChatCommands.cc
+6 -2
View File
@@ -680,7 +680,7 @@ static void server_command_password(shared_ptr<ServerState>, shared_ptr<Lobby> l
}
}
static void server_command_spec(shared_ptr<ServerState>, shared_ptr<Lobby> l,
static void server_command_toggle_spectator_flag(shared_ptr<ServerState>, shared_ptr<Lobby> l,
shared_ptr<Client> c, const std::u16string&) {
check_is_game(l, true);
check_is_leader(l, c);
@@ -689,6 +689,10 @@ static void server_command_spec(shared_ptr<ServerState>, shared_ptr<Lobby> l,
throw logic_error("Episode 3 client in non-Episode 3 game");
}
if (l->flags & Lobby::Flag::IS_SPECTATOR_TEAM) {
send_text_message(c, u"$C6This command cannot\nbe used in a spectator\nteam");
}
if (l->flags & Lobby::Flag::SPECTATORS_FORBIDDEN) {
l->flags &= ~Lobby::Flag::SPECTATORS_FORBIDDEN;
send_text_message(l, u"$C6Spectators allowed");
@@ -1373,7 +1377,7 @@ static const unordered_map<u16string, ChatCommandDefinition> chat_commands({
{u"$secid", {server_command_secid, proxy_command_secid}},
{u"$silence", {server_command_silence, nullptr}},
{u"$song", {server_command_song, proxy_command_song}},
{u"$spec", {server_command_spec, nullptr}},
{u"$spec", {server_command_toggle_spectator_flag, nullptr}},
{u"$ss", {nullptr, proxy_command_send_server}},
{u"$surrender", {server_command_surrender, nullptr}},
{u"$swa", {server_command_switch_assist, proxy_command_switch_assist}},