[nexuiz-commits] r8085 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Oct 9 16:49:34 EDT 2009
Author: samual
Date: 2009-10-09 16:49:34 -0400 (Fri, 09 Oct 2009)
New Revision: 8085
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/server/g_damage.qc
trunk/data/qcsrc/server/miscfunctions.qc
Log:
Change typefrag fragmessage to be on by default + small fixes
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-10-09 19:36:24 UTC (rev 8084)
+++ trunk/data/defaultNexuiz.cfg 2009-10-09 20:49:34 UTC (rev 8085)
@@ -310,7 +310,7 @@
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
Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc 2009-10-09 19:36:24 UTC (rev 8084)
+++ trunk/data/qcsrc/server/g_damage.qc 2009-10-09 20:49:34 UTC (rev 8085)
@@ -369,13 +369,17 @@
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;
}
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2009-10-09 19:36:24 UTC (rev 8084)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2009-10-09 20:49:34 UTC (rev 8085)
@@ -124,11 +124,9 @@
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");
More information about the nexuiz-commits
mailing list