[nexuiz-commits] r8115 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Oct 12 19:26:20 EDT 2009
Author: samual
Date: 2009-10-12 19:26:18 -0400 (Mon, 12 Oct 2009)
New Revision: 8115
Modified:
trunk/data/qcsrc/server/ctf.qc
trunk/data/qcsrc/server/g_damage.qc
trunk/data/qcsrc/server/nexball.qc
trunk/data/qcsrc/server/race.qc
trunk/data/qcsrc/server/vote.qc
trunk/data/qcsrc/server/w_campingrifle.qc
trunk/data/qcsrc/server/w_crylink.qc
trunk/data/qcsrc/server/w_electro.qc
trunk/data/qcsrc/server/w_laser.qc
Log:
Use gender-neutral kill/suicide messages
Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc 2009-10-12 21:59:51 UTC (rev 8114)
+++ trunk/data/qcsrc/server/ctf.qc 2009-10-12 23:26:18 UTC (rev 8115)
@@ -467,7 +467,7 @@
h0 = db_get(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"));
h1 = other.netname;
if(h0 == h1)
- h0 = "his";
+ h0 = "their";
else
h0 = strcat(h0, "^7's"); // h0: display text for previous netname
if (flagcaptimerecord == 0)
Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc 2009-10-12 21:59:51 UTC (rev 8114)
+++ trunk/data/qcsrc/server/g_damage.qc 2009-10-12 23:26:18 UTC (rev 8115)
@@ -274,11 +274,11 @@
if(sv_gentle) {
if (deathtype == DEATH_CAMP)
- bprint ("^1",s, "^1 thought he found a nice camping ground\n");
+ bprint ("^1",s, "^1 thought they found a nice camping ground\n");
else if (deathtype == DEATH_MIRRORDAMAGE)
bprint ("^1",s, "^1 didn't become friends with the Lord of Teamplay\n");
else
- bprint ("^1",s, "^1 will be reinserted into the game due to his own actions\n");
+ bprint ("^1",s, "^1 will be reinserted into the game due to their own actions\n");
if(deathtype != DEATH_TEAMCHANGE)
{
@@ -303,11 +303,11 @@
else if (deathtype == DEATH_NOAMMO)
bprint ("^7",s, "^7 committed suicide. What's the point of living without ammo?\n");
else if (deathtype == DEATH_CAMP)
- bprint ("^1",s, "^1 thought he found a nice camping ground\n");
+ bprint ("^1",s, "^1 thought they found a nice camping ground\n");
else if (deathtype == DEATH_MIRRORDAMAGE)
bprint ("^1",s, "^1 didn't become friends with the Lord of Teamplay\n");
else if (deathtype == DEATH_CHEAT)
- bprint ("^1",s, "^1 unfairly eliminated himself\n");
+ bprint ("^1",s, "^1 unfairly eliminated themself\n");
else if (deathtype == DEATH_FIRE)
bprint ("^1",s, "^1 burned to death\n");
else if (deathtype != DEATH_TEAMCHANGE)
Modified: trunk/data/qcsrc/server/nexball.qc
===================================================================
--- trunk/data/qcsrc/server/nexball.qc 2009-10-12 21:59:51 UTC (rev 8114)
+++ trunk/data/qcsrc/server/nexball.qc 2009-10-12 23:26:18 UTC (rev 8115)
@@ -347,7 +347,7 @@
if (ball.team == self.team) //owngoal (regular goals)
{
LogNB("owngoal", ball.pusher);
- bprint("Boo! ", pname, "^7 scored a goal against his own team!\n");
+ bprint("Boo! ", pname, "^7 scored a goal against their own team!\n");
pscore = -1;
} else if (self.team == GOAL_FAULT) {
LogNB("fault", ball.pusher);
Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc 2009-10-12 21:59:51 UTC (rev 8114)
+++ trunk/data/qcsrc/server/race.qc 2009-10-12 23:26:18 UTC (rev 8115)
@@ -180,7 +180,7 @@
else if(t < grecordtime)
{
if(grecordholder == "")
- bprint(e.netname, "^7 broke his all-time fastest lap record with ", TIME_ENCODED_TOSTRING(t), "\n");
+ bprint(e.netname, "^7 broke their all-time fastest lap record with ", TIME_ENCODED_TOSTRING(t), "\n");
else
bprint(e.netname, "^7 broke ", grecordholder, "^7's all-time fastest lap record with ", TIME_ENCODED_TOSTRING(t), "\n");
db_put(ServerProgsDB, strcat(GetMapname(), rr, "time"), ftos(t));
@@ -191,7 +191,7 @@
else
{
if(grecordholder == "")
- bprint(e.netname, "^7's new fastest lap could not break his all-time fastest lap record of ", TIME_ENCODED_TOSTRING(grecordtime), "\n");
+ bprint(e.netname, "^7's new fastest lap could not break their all-time fastest lap record of ", TIME_ENCODED_TOSTRING(grecordtime), "\n");
else
bprint(e.netname, "^7's new fastest lap could not break ", grecordholder, "^7's all-time fastest lap record of ", TIME_ENCODED_TOSTRING(grecordtime), "\n");
}
Modified: trunk/data/qcsrc/server/vote.qc
===================================================================
--- trunk/data/qcsrc/server/vote.qc 2009-10-12 21:59:51 UTC (rev 8114)
+++ trunk/data/qcsrc/server/vote.qc 2009-10-12 23:26:18 UTC (rev 8115)
@@ -221,7 +221,7 @@
} else if(VoteCheckNasty(dovote)) {
print_to(e, "Syntax error in command. See 'vhelp' for more info.");
} else if(RemapVote(dovote, "vdo", e)) { // strcat seems to be necessary
- bprint("\{1}^2* ^3", VoteNetname(e), "^2 used his ^3master^2 status to do \"^2", RemapVote_display, "^2\".\n");
+ bprint("\{1}^2* ^3", VoteNetname(e), "^2 used their ^3master^2 status to do \"^2", RemapVote_display, "^2\".\n");
if(cvar("sv_eventlog"))
GameLogEcho(strcat(":vote:vdo:", ftos(e.playerid), ":", RemapVote_display));
localcmd(strcat(RemapVote_vote, "\n"));
Modified: trunk/data/qcsrc/server/w_campingrifle.qc
===================================================================
--- trunk/data/qcsrc/server/w_campingrifle.qc 2009-10-12 21:59:51 UTC (rev 8114)
+++ trunk/data/qcsrc/server/w_campingrifle.qc 2009-10-12 23:26:18 UTC (rev 8115)
@@ -194,9 +194,9 @@
else if (req == WR_SUICIDEMESSAGE)
{
if(w_deathtype & HITTYPE_SECONDARY)
- w_deathtypestring = "shot himself automatically";
+ w_deathtypestring = "shot themself automatically";
else
- w_deathtypestring = "sniped himself somehow";
+ w_deathtypestring = "sniped themself somehow";
}
else if (req == WR_KILLMESSAGE)
{
Modified: trunk/data/qcsrc/server/w_crylink.qc
===================================================================
--- trunk/data/qcsrc/server/w_crylink.qc 2009-10-12 21:59:51 UTC (rev 8114)
+++ trunk/data/qcsrc/server/w_crylink.qc 2009-10-12 23:26:18 UTC (rev 8115)
@@ -241,7 +241,7 @@
return self.ammo_cells >= cvar("g_balance_crylink_secondary_ammo");
else if (req == WR_SUICIDEMESSAGE)
{
- w_deathtypestring = "succeeded at self-destructing himself with the Crylink";
+ w_deathtypestring = "succeeded at self-destructing themself with the Crylink";
}
else if (req == WR_KILLMESSAGE)
{
Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc 2009-10-12 21:59:51 UTC (rev 8114)
+++ trunk/data/qcsrc/server/w_electro.qc 2009-10-12 23:26:18 UTC (rev 8115)
@@ -271,7 +271,7 @@
else if (req == WR_SUICIDEMESSAGE)
{
if(w_deathtype & HITTYPE_SECONDARY)
- w_deathtypestring = "could not remember where he put plasma";
+ w_deathtypestring = "could not remember where they put plasma";
else
w_deathtypestring = "played with plasma";
}
Modified: trunk/data/qcsrc/server/w_laser.qc
===================================================================
--- trunk/data/qcsrc/server/w_laser.qc 2009-10-12 21:59:51 UTC (rev 8114)
+++ trunk/data/qcsrc/server/w_laser.qc 2009-10-12 23:26:18 UTC (rev 8115)
@@ -143,7 +143,7 @@
else if (req == WR_CHECKAMMO2)
return TRUE;
else if (req == WR_SUICIDEMESSAGE)
- w_deathtypestring = "lasered himself to hell";
+ w_deathtypestring = "lasered themself to hell";
else if (req == WR_KILLMESSAGE)
{
w_deathtypestring = "was lasered to death by"; // unchecked: SPLASH
More information about the nexuiz-commits
mailing list