Merge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/arena_gamemode
authorterencehill <piuntn@gmail.com>
Tue, 5 Feb 2013 22:55:07 +0000 (23:55 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 5 Feb 2013 23:02:23 +0000 (00:02 +0100)
Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/scores.qc

25 files changed:
1  2 
_hud_descriptions.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_hook.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/mutator_superspec.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/scores.qc
qcsrc/server/sv_main.qc

Simple merge
diff --cc hud_luminos.cfg
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc hud_nexuiz.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -401,17 -401,6 +401,24 @@@ void PutObserverInServer (void
                WriteEntity(MSG_ONE, self);
        }
  
 +      if(g_lms)
 +      {
 +              // Only if the player cannot play at all
 +              if(PlayerScore_Add(self, SP_LMS_RANK, 0) == 666)
 +                      self.frags = FRAGS_SPECTATOR;
 +              else
 +                      self.frags = FRAGS_LMS_LOSER;
 +      }
++      else if((g_race && g_race_qualifying) || g_cts)
++      {
++              if(PlayerScore_Add(self, SP_RACE_FASTEST, 0))
++                      self.frags = FRAGS_LMS_LOSER;
++              else
++                      self.frags = FRAGS_SPECTATOR;
++      }
 +      else
 +              self.frags = FRAGS_SPECTATOR;
 +
        DropAllRunes(self);
        MUTATOR_CALLHOOK(MakePlayerObserver);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -69,13 -78,9 +69,13 @@@ float freezetag_CheckTeams(
        }
        if(prev_total_players != total_players)
        {
-               string teams_missing;
+               string teams_missing = "";
                if(!redalive)   teams_missing = strcat(teams_missing, ColoredTeamName(COLOR_TEAM1), ", ");
                if(!bluealive)  teams_missing = strcat(teams_missing, ColoredTeamName(COLOR_TEAM2), ", ");
 +              if(freezetag_teams >= 3)
 +              if(!yellowalive)        teams_missing = strcat(teams_missing, ColoredTeamName(COLOR_TEAM3), ", ");
 +              if(freezetag_teams == 4)
 +              if(!pinkalive)  teams_missing = strcat(teams_missing, ColoredTeamName(COLOR_TEAM4), ", ");
                teams_missing = substring(teams_missing, 0, strlen(teams_missing)-2);
  
                FOR_EACH_REALCLIENT(e)
Simple merge
Simple merge
@@@ -250,12 -254,12 +254,12 @@@ float PlayerScore_Clear(entity player
        float i;
  
        if(teamscores_entities_count)
-               return;
+               return 0;
  
-       if(MUTATOR_CALLHOOK(ForbidPlayerScore_Clear)) return;
-       if(g_lms) return;
-       if(g_cts) return; // in CTS, you don't lose score by observing
-       if(g_race && g_race_qualifying) return; // in qualifying, you don't lose score by observing
++      if(MUTATOR_CALLHOOK(ForbidPlayerScore_Clear)) return 0;
+       if(g_lms) return 0;
 -      if(g_arena || g_ca) return 0;
+       if(g_cts) return 0; // in CTS, you don't lose score by observing
+       if(g_race && g_race_qualifying) return 0; // in qualifying, you don't lose score by observing
  
        sk = player.scorekeeper;
        for(i = 0; i < MAX_SCORE; ++i)
Simple merge