diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg index a3d8d655..42a4a962 100644 --- a/config/menus_multiplayer.cfg +++ b/config/menus_multiplayer.cfg @@ -17,6 +17,7 @@ newmenu "In-game" menuitemtextinput "Nickname: " "result $curname" "name $arg1" [__ingamemenu_showmodel "In-game" 0] menuitem "Change weapon..." "showmenu Weapons" [__ingamemenu_showmodel "In-game" 0] menuitem "Change to the enemy team" "changeteam" [__ingamemenu_showmodel "In-game" 1] +menuitem "Change to spectate mode" "gospectate" [__ingamemenu_showmodel "In-game" 1] menuitem "Change player skin..." [showmenu (at [CLA RVSF] (curteam))] [__ingamemenu_showmodel "In-game" 1] menuitem "" -1 [__ingamemenu_showmodel "In-game" 0] menuitem "Set mode/map..." "showmenu Gamemode" @@ -29,7 +30,7 @@ menuitem " 4Main menu..." [ closemenu In-game; showmenu main ] menuitem " 4Browse servers..." [ closemenu "In-game"; joinservermenu ] menuitem " 3Disconnect from server" "disconnect" menuitem " 3Quit AssaultCube" "savequit" -menuinitselection 12 +menuinitselection 13 alias __ingamemenu_showmodel [ if (&& (< (curteam) 4) $arg2) [ @@ -52,7 +53,8 @@ menuitem "Give admin..." [ showmenu "give admin" ] menuitem "" -1 menuitemtextinput "Nickname: " "result $curname" "name $arg1" menuitem "Change weapon..." "showmenu Weapons" [__ingamemenu_showmodel "In-game admin" 0] -menuitem "Change to the enemy team" "changeteam" [__ingamemenu_showmodel "In-game admin" 1] +menuitem "Change to the enemy team" "changeteam" [__ingamemenu_showmodel "In-game admin" 1] +menuitem "Change to spectate mode" "gospectate" [__ingamemenu_showmodel "In-game admin" 1] menuitem "Change player skin..." [showmenu (at [CLA RVSF] (curteam))] [__ingamemenu_showmodel "In-game admin" 1] menuitem "Demos..." "showmenu Demo" [__ingamemenu_showmodel "In-game admin" 0] menuitem "" -1 @@ -60,7 +62,7 @@ menuitem " 4Main menu..." [ closemenu "In-game admin"; showmenu main ] menuitem " 4Browse servers..." [ closemenu "In-game admin"; joinservermenu ] menuitem " 3Disconnect from server" "disconnect" menuitem " 3Quit AssaultCube" "savequit" -menuinitselection 15 +menuinitselection 16 // Multiplayer menu only opens through the main menu (when disconnected). newmenu multiplayer @@ -119,11 +121,11 @@ menuitem "Last Swiss Standing" "mode 9; showmenu maps" menuitem "One Shot, One Kill" "mode 10; showmenu maps" menuitem "Team One Shot, One Kill" "mode 11; showmenu maps" - newmenu Mastermode menuitem "Unlock the server (open)" "mastermode 0" menuitem "Lock the server (private)" "mastermode 1" +menuitem "Lock the server (match mode)" "mastermode 2" newmenu Auto-team diff --git a/config/scripts.cfg b/config/scripts.cfg index 68c02f22..38156114 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -61,6 +61,8 @@ alias resetbinds [ exec config/resetbinds.cfg; echo " 3All binds have been reset // "changeteam" command. alias changeteam [ if (< (curteam) 4) [ team (at "RVSF CLA RVSF-SPECT CLA-SPECT" (curteam)) ] ] +// "gospectate" command +alias gospectate [ suicide; sleep 500 [ team SPECTATOR ] ] // Mode/map-setting aliases. alias votemap [ mode $arg1; map $arg2 ] diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 4729cf95..243ac791 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -185,6 +185,7 @@ void newteam(char *name) int nt = teamatoi(name); if(nt == player1->team) return; // same team if(!team_isvalid(nt)) { conoutf("\f3\"%s\" is not a valid team name (try CLA, RVSF or SPECTATOR)", name); return; } + if(team_isspect(nt) && player1->state != CS_DEAD) { conoutf("you need to be dead to become spectator"); return; } addmsg(SV_TRYTEAM, "ri", nt); } else conoutf("your team is: %s", team_string(player1->team)); diff --git a/source/src/server.cpp b/source/src/server.cpp index c8995295..dd5f41f8 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -1495,23 +1495,25 @@ bool updateclientteam(int cln, int newteam, int ftr) } if(ftr == FTR_PLAYERWISH) { - if(mastermode == MM_MATCH && matchteamsize) + if(mastermode == MM_MATCH && matchteamsize && m_teammode) { if(newteam != TEAM_SPECT && (team_base(newteam) != team_base(cl.team) || !m_teammode)) return false; // no switching sides in match mode when teamsize is set } if(team_isactive(newteam)) { + if(!m_teammode && cl.state.state != CS_DEAD) return false; // no cheap respawning if(mastermode == MM_MATCH) { - if(matchteamsize && teamsizes[newteam] >= matchteamsize) return false; // ensure maximum team size + if(m_teammode && matchteamsize && teamsizes[newteam] >= matchteamsize) return false; // ensure maximum team size } else { - if(autoteam && teamsizes[newteam] > teamsizes[team_opposite(newteam)]) return false; // don't switch to an already bigger team + if(m_teammode && autoteam && teamsizes[newteam] > teamsizes[team_opposite(newteam)]) return false; // don't switch to an already bigger team } } else { + if(team_isactive(cl.team) && cl.state.state != CS_DEAD) return false; // you need to be dead to change to spectator if(mastermode != MM_MATCH || !m_teammode) newteam = TEAM_SPECT; // only match mode (team) has more than one spect team } }