Merge branch 'master' into terencehill/ca_arena_mutators
authorterencehill <piuntn@gmail.com>
Sun, 31 Mar 2013 21:20:41 +0000 (23:20 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 31 Mar 2013 21:20:41 +0000 (23:20 +0200)
Conflicts:
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/progs.src

16 files changed:
1  2 
gamemodes.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/common/mapinfo.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/teamplay.qc

diff --cc gamemodes.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -401,25 -401,6 +401,24 @@@ void PutObserverInServer (void
                WriteEntity(MSG_ONE, self);
        }
  
-       DropAllRunes(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;
 +
        MUTATOR_CALLHOOK(MakePlayerObserver);
  
        minstagib_stop_countdown(self);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -105,7 -101,8 +105,7 @@@ g_subs.q
  
  g_tetris.qc
  
- runematch.qc
//runematch.qc
 -arena.qc
  
  g_violence.qc
  g_damage.qc
Simple merge
Simple merge