Merge branch 'master' into Mario/lms_updates
authorMario <mario.mario@y7mail.com>
Tue, 9 Apr 2013 05:39:35 +0000 (15:39 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 9 Apr 2013 05:39:35 +0000 (15:39 +1000)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/cl_weapons.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/scores.qc
qcsrc/server/t_items.qc
qcsrc/server/teamplay.qc

Simple merge
Simple merge
Simple merge
@@@ -197,10 -186,24 +186,6 @@@ void GiveFrags (entity attacker, entit
        else
        {
                self = oldself;
-               if(g_runematch)
 -              if(g_lms)
--              {
-                       f = RunematchHandleFrags(attacker, targ, f);
 -                      // remove a life
 -                      float tl;
 -                      tl = PlayerScore_Add(targ, SP_LMS_LIVES, -1);
 -                      if(tl < lms_lowest_lives)
 -                              lms_lowest_lives = tl;
 -                      if(tl <= 0)
 -                      {
 -                              if(!lms_next_place)
 -                                      lms_next_place = player_count;
 -                              else
 -                                      lms_next_place = min(lms_next_place, player_count);
 -                              PlayerScore_Add(targ, SP_LMS_RANK, lms_next_place); // won't ever spawn again
 -                              --lms_next_place;
 -                      }
 -                      f = 0;
--              }
        }
  
        attacker.totalfrags += f;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge