From: terencehill <piuntn@gmail.com>
Date: Sun, 25 Feb 2024 09:55:47 +0000 (+0000)
Subject: Merge branch 'terencehill/intermission_restart_fix' into 'master'
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=073f7cf07c487df5b71c17f13fc152f21573ae5a

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
---

073f7cf07c487df5b71c17f13fc152f21573ae5a
diff --cc qcsrc/server/mapvoting.qh
index c33dd5242,8c6a2a769..36578740c
--- a/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;