Merge branch 'terencehill/spectate_player' into 'master'

Make so that 'spectate playerX' does nothing if it fails to spectate playerX

Closes #2328

See merge request xonotic/xonotic-data.pk3dir!726

diff --combined qcsrc/client/hud/panel/quickmenu.qc
index 3e61f9b5a6c08f9ef62147c60bd9659c7ffa2f55,005a25d5c61eb58633df6771686146373135ccf8..c58fb2a675f5d191a5ba55d1ee385a0753321a37
--- 1/qcsrc/client/hud/panel/quickmenu.qc
--- 2/qcsrc/client/hud/panel/quickmenu.qc
+++ b/qcsrc/client/hud/panel/quickmenu.qc
@@@ -790,7 -790,7 +790,7 @@@ void QuickMenu_Default(string target_su
        if(teamplay)
        {
        QUICKMENU_SMENU(CTX(_("QMCMD^Team chat")), "Team chat")
 -              QUICKMENU_ENTRY_TC(CTX(_("QMCMD^quad soon")), "say_team %s", "quad soon", CTX(_("QMCMD^quad soon")))
 +              QUICKMENU_ENTRY_TC(CTX(_("QMCMD^strength soon")), "say_team %s", "strength soon", CTX(_("QMCMD^strength soon")))
                QUICKMENU_ENTRY_TC(CTX(_("QMCMD^free item, icon")), "say_team %s; g_waypointsprite_team_here_p", "free item %x^7 (l:%y^7)", CTX(_("QMCMD^free item %x^7 (l:%y^7)")))
                QUICKMENU_ENTRY_TC(CTX(_("QMCMD^took item, icon")), "say_team %s; g_waypointsprite_team_here", "took item (l:%l^7)", CTX(_("QMCMD^took item (l:%l^7)")))
                QUICKMENU_ENTRY_TC(CTX(_("QMCMD^negative")), "say_team %s", "negative", CTX(_("QMCMD^negative")))
@@@ -827,7 -827,11 +827,7 @@@
  
                if(spectatee_status > 0)
                {
 -              QUICKMENU_SMENU(CTX(_("QMCMD^Spectator camera")), "Spectator camera")
 -                      QUICKMENU_ENTRY(CTX(_("QMCMD^1st person")), "chase_active 0; -use")
 -                      QUICKMENU_ENTRY(CTX(_("QMCMD^3rd person around player")), "chase_active 1; +use")
 -                      QUICKMENU_ENTRY(CTX(_("QMCMD^3rd person behind")), "chase_active 1; -use")
 -              QUICKMENU_SMENU(CTX(_("QMCMD^Spectator camera")), "Spectator camera")
 +              QUICKMENU_ENTRY(CTX(_("QMCMD^Change spectator camera")), "dropweapon")
                }
  
                if(spectatee_status == -1)
@@@ -854,6 -858,11 +854,11 @@@
                QUICKMENU_ENTRY(CTX(_("QMCMD^Shuffle teams")), "vcall shuffleteams")
        QUICKMENU_SMENU(CTX(_("QMCMD^Call a vote")), "Call a vote")
  
+       if(spectatee_status != 0)
+       {
+       QUICKMENU_SMENU_PL(CTX(_("QMCMD^Spectate a player")), "Spectate a player", "spectate \"%s^7\"", 0, 1)
+       }
+ 
        if(target_submenu != "" && !target_submenu_found)
        {
                LOG_INFOF("Couldn't find submenu \"%s\"", target_submenu);