Merge remote branch 'origin/master' into samual/hud_updates

diff --combined qcsrc/server/miscfunctions.qc
index fc3ce65d20ff7889ed0769609d194626c3c152de,27c04f8a4d02499a2549a81c9aedec74ec53958e..d7286c055bf62220f7ab57630f867d876ebf39de
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -79,6 -79,53 +79,6 @@@ string strcat1(string s) = #115; // FRI
  float logfile_open;
  float logfile;
  
 -string GetAdvancedDeathReports(entity enPlayer) // Extra fragmessage information
 -{
 -      float nPlayerHealth = rint(enPlayer.health);
 -      float nPlayerArmor = rint(enPlayer.armorvalue);
 -      float nPlayerHandicap = enPlayer.cvar_cl_handicap;
 -      float nPlayerPing = rint(enPlayer.ping);
 -      string strPlayerPingColor;
 -      string strMessage;
 -      
 -      if(nPlayerPing >= 150)
 -              strPlayerPingColor = "^1";
 -      else
 -              strPlayerPingColor = "^2";
 -
 -      if((autocvar_sv_fragmessage_information_stats) && (enPlayer.health >= 1))
 -              strMessage = strcat(strMessage, "^7(Health ^1", ftos(nPlayerHealth), "^7 / Armor ^2", ftos(nPlayerArmor), "^7)");
 -
 -      if(autocvar_sv_fragmessage_information_ping) {
 -              if(clienttype(enPlayer) == CLIENTTYPE_BOT) // Bots have no ping
 -                      strMessage = strcat(strMessage, " ^7(^2Bot");
 -              else
 -                      strMessage = strcat(strMessage, " ^7(Ping ", strPlayerPingColor, ftos(nPlayerPing), "ms");
 -              if(autocvar_sv_fragmessage_information_handicap)
 -                      if(autocvar_sv_fragmessage_information_handicap == 2)
 -                              if(nPlayerHandicap <= 1)
 -                                      strMessage = strcat(strMessage, "^7 / Handicap ^2Off^7)");
 -                              else
 -                                      strMessage = strcat(strMessage, "^7 / Handicap ^2", ftos(nPlayerHandicap), "^7)");
 -                      else if not(nPlayerHandicap <= 1)
 -                              strMessage = strcat(strMessage, "^7 / Handicap ^2", ftos(nPlayerHandicap), "^7)");
 -              else
 -                      strMessage = strcat(strMessage, "^7)");
 -      } else if(autocvar_sv_fragmessage_information_handicap) {
 -              if(autocvar_sv_fragmessage_information_handicap == 2)
 -                      if(nPlayerHandicap <= 1)
 -                              strMessage = strcat(strMessage, "^7(Handicap ^2Off^7)");
 -                      else
 -                              strMessage = strcat(strMessage, "^7(Handicap ^2", ftos(nPlayerHandicap), "^7)");
 -              else if(nPlayerHandicap > 1)
 -                      strMessage = strcat(strMessage, "^7(Handicap ^2", ftos(nPlayerHandicap), "^7)");
 -      }
 -      
 -      if(strMessage) // add new line to the beginning if there is a message
 -              strMessage = strcat("\n", strMessage);
 -              
 -      return strMessage;
 -}
  void bcenterprint(string s)
  {
      // TODO replace by MSG_ALL (would show it to spectators too, though)?
@@@ -1245,7 -1292,9 +1245,9 @@@ float sound_allowed(float dest, entity 
      {
          if (e.classname == "body")
              e = e.enemy;
-         if (e.owner && e.owner != e)
+       else if (e.realowner && e.realowner != e)
+             e = e.realowner;
+       else if (e.owner && e.owner != e)
              e = e.owner;
          else
              break;