From 17e66cdd74381f17e536da502df5f82f138b93bc Mon Sep 17 00:00:00 2001 From: samual Date: Fri, 9 Oct 2009 20:49:34 +0000 Subject: [PATCH] Change typefrag fragmessage to be on by default + small fixes git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8085 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 2 +- data/qcsrc/server/g_damage.qc | 10 +++++++--- data/qcsrc/server/miscfunctions.qc | 6 ++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 136658503..42d40a41d 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -310,7 +310,7 @@ set g_telefrags 1 set sv_fragmessage_information_ping 0 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)" set sv_fragmessage_information_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)" set sv_fragmessage_information_stats 0 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)" -set sv_fragmessage_information_typefrag 0 "Enable typefrag display information, 0 = Never display; 1 = Always display (Only available for the person fragged)" +set sv_fragmessage_information_typefrag 1 "Enable typefrag display information, 0 = Never display; 1 = Always display (Only available for the person fragged)" // use default physics set sv_friction_on_land 0 diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 3eaab87d1..6b830ed13 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -369,13 +369,17 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) victim_message = "^1First victim\n"; // or First casualty } } - if(sv_gentle > 0) { centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You scored against ^7", s, GetAdvancedDeathReports(targ))); centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, a,"^1 scored against you ^7", GetAdvancedDeathReports(attacker))); } else { - centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You fragged ^7", s, GetAdvancedDeathReports(targ))); - centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were fragged by ^7", a, GetAdvancedDeathReports(attacker))); + if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) { + centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You ^1typefragged ^7", s, GetAdvancedDeathReports(targ))); + centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typefragged by ^7", a, GetAdvancedDeathReports(attacker))); + } else { + centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You fragged ^7", s, GetAdvancedDeathReports(targ))); + centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were fragged by ^7", a, GetAdvancedDeathReports(attacker))); + } attacker.taunt_soundtime = time + 1; } diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 94f5256aa..e64093af8 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -124,11 +124,9 @@ string GetAdvancedDeathReports(entity enPlayer) // Extra fragmessage information else strPlayerPingColor = "^2"; - if((cvar("sv_fragmessage_information_typefrag")) && (enPlayer.classname == "player") && (enPlayer.BUTTON_CHAT)) - strMessage = strcat(strMessage, " ^1(typefrag)"); - if((cvar("sv_fragmessage_information_stats")) && (nPlayerHealth >= 1)) + if((cvar("sv_fragmessage_information_stats")) && (enPlayer.health >= 1)) strMessage = strcat(strMessage, "\n^7(Health ^1", ftos(nPlayerHealth), "^7 / Armor ^2", ftos(nPlayerArmor), "^7)"); - + if(cvar("sv_fragmessage_information_ping")) { if(clienttype(enPlayer) == CLIENTTYPE_BOT) // Bots have no ping strMessage = strcat(strMessage, "\n^7(^2Bot"); -- 2.39.2