Merge branch 'terencehill/intermission_restart_fix' into 'master'

Fix restart applying different gametype if called after gametype vote

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

diff --cc qcsrc/server/mapvoting.qc
Simple merge

diff --cc qcsrc/server/mapvoting.qh
index c33dd5242f9614d515bfa71b8b287a262ae25164,8c6a2a7690cc7c6e0efb075411839f929c6f6fef..36578740c07fff735e11041ce9811d1284727484
--- 1/qcsrc/server/mapvoting.qh
--- 2/qcsrc/server/mapvoting.qh
+++ b/qcsrc/server/mapvoting.qh
@@@ -30,9 -30,8 +30,9 @@@ void MapVote_Start()
  void MapVote_Spawn();
  void MapVote_Think();
  void MapVote_SendPicture(entity to, int id);
 +bool GameTypeVote_SetGametype(entity type);
  float GameTypeVote_Start();
- float GameTypeVote_Finished(float pos);
+ float GameTypeVote_Finished(int pos);
  string GameTypeVote_MapInfo_FixName(string m);
  
  bool gametypevote;