Merge branch 'terencehill/gameover_stuff' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 10 Dec 2016 06:13:34 +0000 (06:13 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 10 Dec 2016 06:13:34 +0000 (06:13 +0000)
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

12 files changed:
1  2 
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/nix/sv_nix.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/vehicles/vehicle/racer.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc
qcsrc/server/command/vote.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
qcsrc/server/player.qc
qcsrc/server/round_handler.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 2954fd1d33a2507f0809bc8838e416f2b0299f3a,f7bf6602d16dbfa610e571481791c6d611c2a8d5..2aede9204052148d1dee08243f137e5379be642f
@@@ -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;
Simple merge
Simple merge