Merge branch 'master' into mirio/balance

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

diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh
index 1225b6be582cecb5feb9ecb6a645d1fd161d0ab6..0cab6c1d4a7559bcd5cf9f9381b664ebc79d2486 100644 (file)
--- a/qcsrc/server/command/vote.qh
+++ b/qcsrc/server/command/vote.qh
@@ -1,35 +1,39 @@
+#ifndef VOTE_H
+#define VOTE_H
+
 // ================================================
 //  Declarations for the vote system/vote commands
 //  Last updated: December 14th, 2011
 // ================================================
 
 // definitions for command selection between progs
-#define VC_ASGNMNT_BOTH 1
-#define VC_ASGNMNT_CLIENTONLY 2
-#define VC_ASGNMNT_SERVERONLY 3
+const float VC_ASGNMNT_BOTH = 1;
+const float VC_ASGNMNT_CLIENTONLY = 2;
+const float VC_ASGNMNT_SERVERONLY = 3;
 
 // vote selection definitions
-#define VOTE_SELECT_ABSTAIN -2
-#define VOTE_SELECT_REJECT -1
-#define VOTE_SELECT_NULL 0
-#define VOTE_SELECT_ACCEPT 1
+const float VOTE_SELECT_ABSTAIN = -2;
+const float VOTE_SELECT_REJECT = -1;
+const float VOTE_SELECT_NULL = 0;
+const float VOTE_SELECT_ACCEPT = 1;
 
 // different statuses of the current vote
-#define VOTE_NULL 0
-#define VOTE_NORMAL 1
-#define VOTE_MASTER 2
+const float VOTE_NULL = 0;
+const float VOTE_NORMAL = 1;
+const float VOTE_MASTER = 2;
 
 // global vote information declarations
-entity vote_caller; // original caller of the current vote
-float vote_called; // stores status of current vote (See VOTE_*)
-float vote_endtime; // time when the vote is finished
-float vote_accept_count; // total amount of players who accept the vote (counted by VoteCount() function)
-float vote_reject_count; // same as above, but rejected
-float vote_abstain_count; // same as above, but abstained
-float vote_needed_overall; // total amount of players NEEDED for a vote to pass (based on sv_vote_majority_factor)
-.float vote_master; // flag for if the player has vote master privelages 
-.float vote_waittime; // flag for how long the player must wait before they can vote again
-.float vote_selection; // flag for which vote selection the player has made (See VOTE_SELECT_*)
+entity vote_caller;         // original caller of the current vote
+string vote_caller_name;    // name of the vote caller
+float vote_called;          // stores status of current vote (See VOTE_*)
+float vote_endtime;         // time when the vote is finished
+float vote_accept_count;    // total amount of players who accept the vote (counted by VoteCount() function)
+float vote_reject_count;    // same as above, but rejected
+float vote_abstain_count;   // same as above, but abstained
+float vote_needed_overall;  // total amount of players NEEDED for a vote to pass (based on sv_vote_majority_factor)
+.float vote_master;         // flag for if the player has vote master privelages
+.float vote_waittime;       // flag for how long the player must wait before they can vote again
+.float vote_selection;      // flag for which vote selection the player has made (See VOTE_SELECT_*)
 string vote_called_command; // command sent by client
 string vote_called_display; // visual string of command sent by client
 string vote_parsed_command; // command which is fixed after being parsed
@@ -41,11 +45,14 @@ void VoteReset();
 void VoteCommand(float request, entity caller, float argc, string vote_command);
 
 // warmup and nagger stuff
-#define RESTART_COUNTDOWN 10
+const float RESTART_COUNTDOWN = 10;
 entity nagger;
-float readycount; // amount of players who are ready
-float readyrestart_happened; // keeps track of whether a restart has already happened
+float readycount;                  // amount of players who are ready
+float readyrestart_happened;       // keeps track of whether a restart has already happened
 float restart_mapalreadyrestarted; // bool, indicates whether reset_map() was already executed
-.float ready; // flag for if a player is ready
+.float ready;                      // flag for if a player is ready
 void reset_map(float dorespawn);
-void ReadyCount();
\ No newline at end of file
+void ReadyCount();
+void ReadyRestart_force();
+void VoteCount(float first_count);
+#endif