From 7dd4066f4cf68b27ba32ceb2bf3464ce0836d67f Mon Sep 17 00:00:00 2001
From: esteel <esteel@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 9 Feb 2006 19:38:53 +0000
Subject: [PATCH] voting is more robust/correct now

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@998 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/gamec/cl_client.c | 3 ---
 data/qcsrc/server/gamec/defs.h      | 2 +-
 data/qcsrc/server/gamec/g_world.c   | 4 ++++
 data/qcsrc/server/gamec/teamplay.c  | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/data/qcsrc/server/gamec/cl_client.c b/data/qcsrc/server/gamec/cl_client.c
index 11b9050a4..410bed3c8 100644
--- a/data/qcsrc/server/gamec/cl_client.c
+++ b/data/qcsrc/server/gamec/cl_client.c
@@ -206,7 +206,6 @@ void PutObserverInServer (void)
 	self.strength_finished = 0;
 	self.invincible_finished = 0;
 	self.pushltime = 0;
-	self.vote_finished = 0;
 	self.think = SUB_Null;
 	self.nextthink = 0;
 	self.hook_time = 0;
@@ -286,7 +285,6 @@ void PutClientInServer (void)
 		self.pushltime = 0;
 		//self.speed_finished = 0;
 		//self.slowmo_finished = 0;
-		self.vote_finished = 0;
 		// players have no think function
 		self.think = SUB_Null;
 		self.nextthink = 0;
@@ -1231,7 +1229,6 @@ void PlayerPreThink (void)
 		centerprint(self, strcat("spectating ", self.enemy.netname, "\n\n\n^7press attack for next player\npress attack2 for free fly mode"));
 		
 	}
-	VoteThink();
 }
 
 /*
diff --git a/data/qcsrc/server/gamec/defs.h b/data/qcsrc/server/gamec/defs.h
index 45977824c..b7c35d45d 100644
--- a/data/qcsrc/server/gamec/defs.h
+++ b/data/qcsrc/server/gamec/defs.h
@@ -192,8 +192,8 @@ float votecalled;
 string votecalledvote;
 float votecalledmaster;
 entity votecaller;
+float votefinished;
 .float vote_master;
-.float vote_finished;
 .float vote_next;
 .float vote_vote;
 void VoteThink();
diff --git a/data/qcsrc/server/gamec/g_world.c b/data/qcsrc/server/gamec/g_world.c
index f085c6739..8994322b4 100644
--- a/data/qcsrc/server/gamec/g_world.c
+++ b/data/qcsrc/server/gamec/g_world.c
@@ -560,6 +560,8 @@ void() NextLevel =
 
 	//pos = FindIntermission ();
 
+	VoteReset();
+
 	DumpStats();
 
 	other = findchainflags(flags, FL_CLIENT);
@@ -645,6 +647,8 @@ void() CheckRules_World =
 	local entity checkrules_oldleader;
 	local entity head;
 
+	VoteThink();
+
 	if (intermission_running)
 	if (time >= intermission_exittime + 60)
 	{
diff --git a/data/qcsrc/server/gamec/teamplay.c b/data/qcsrc/server/gamec/teamplay.c
index 4d8d71f7f..0a57b062f 100644
--- a/data/qcsrc/server/gamec/teamplay.c
+++ b/data/qcsrc/server/gamec/teamplay.c
@@ -99,6 +99,8 @@ void InitGameplayMode()
 {
 	float fraglimit_override, timelimit_override;
 
+	VoteReset();
+
 	game = cvar ("gamecfg");	// load game options
 
 	// game cvars get reset before map changes
-- 
2.39.2