Merge branch 'master' into terencehill/scoreboard_ui

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mapvoting.qh

diff --git a/qcsrc/server/mapvoting.qh b/qcsrc/server/mapvoting.qh
index e4e6b0b52ac8b49582751d4cd32f868824c9a5cc..7bc8a84eabcc48a6995271ed59f1a221fe2933ac 100644 (file)
--- a/qcsrc/server/mapvoting.qh
+++ b/qcsrc/server/mapvoting.qh
@@ -1,11 +1,35 @@
-#ifndef MAPVOTING_H
-#define MAPVOTING_H
+#pragma once
+
+#define autocvar_g_maplist cvar_string("g_maplist")
+bool autocvar_g_maplist_check_waypoints;
+int autocvar_g_maplist_index;
+string autocvar_g_maplist_mostrecent;
+int autocvar_g_maplist_mostrecent_count;
+bool autocvar_g_maplist_selectrandom;
+float autocvar_g_maplist_shuffle;
+#define autocvar_g_maplist_votable cvar("g_maplist_votable")
+bool autocvar_g_maplist_votable_abstain;
+float autocvar_g_maplist_votable_keeptwotime;
+bool autocvar_g_maplist_votable_nodetail;
+string autocvar_g_maplist_votable_screenshot_dir;
+bool autocvar_g_maplist_votable_suggestions;
+bool autocvar_g_maplist_votable_suggestions_override_mostrecent;
+float autocvar_g_maplist_votable_timeout;
+bool autocvar_g_maplist_ignore_sizes;
+bool autocvar_g_maplist_sizes_count_maxplayers = true;
+bool autocvar_g_maplist_sizes_count_bots = true;
+int autocvar_rescan_pending;
+bool autocvar_sv_vote_gametype;
+float autocvar_sv_vote_gametype_timeout;
+string autocvar_sv_vote_gametype_options;
+float autocvar_sv_vote_gametype_keeptwotime;
+bool autocvar_sv_vote_gametype_default_current;
 
 // definitions for functions used outside mapvoting.qc
 void MapVote_Start();
 void MapVote_Spawn();
 void MapVote_Think();
-void MapVote_SendPicture(float id);
+void MapVote_SendPicture(entity to, int id);
 float GameTypeVote_Start();
 float GameTypeVote_Finished(float pos);
 string GameTypeVote_MapInfo_FixName(string m);
@@ -13,4 +37,3 @@ string GameTypeVote_MapInfo_FixName(string m);
 float gametypevote;
 string getmapname_stored;
 float mapvote_initialized;
-#endif