From: Mario <zacjardine@y7mail.com>
Date: Sat, 10 Dec 2016 06:13:34 +0000 (+0000)
Subject: Merge branch 'terencehill/gameover_stuff' into 'master'
X-Git-Tag: xonotic-v0.8.2~389
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=429e52163f53e75b848135f076b77c4eb43935ac;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/gameover_stuff' into 'master'

gameover stuff

* Assault: when the first round ends show the message "Objective destroyed in X minutes" and block the game for 5 seconds before starting the other round in order to show objective destruction
* When a round ends block players and switch to 3rd person view (affected game types: Clan Arena, Domination, Freeze Tag, Invasion, Onslaught)

Implementation details:
* intermission_running and gameover are now 2 different conditions
* if set gameover has the effect of blocking players and triggering 3rd person view (eventchase); server must reset (respawn) players and vehicles (round_handler takes care of it) when resetting gameover to false.

See merge request !368
---

429e52163f53e75b848135f076b77c4eb43935ac
diff --cc qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
index 2954fd1d3,f7bf6602d..2aede9204
--- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
@@@ -155,13 -156,10 +155,13 @@@ void kh_Controller_SetThink(float t, kh
  void kh_WaitForPlayers();
  void kh_Controller_Think(entity this)  // called a lot
  {
- 	if(intermission_running)
+ 	if(gameover)
  		return;
  	if(this.cnt > 0)
 -	{ if(getthink(this) != kh_WaitForPlayers) { this.cnt -= 1; } }
 +	{
 +		if(getthink(this) != kh_WaitForPlayers)
 +			this.cnt -= 1;
 +	}
  	else if(this.cnt == 0)
  	{
  		this.cnt -= 1;