From 2e4d3d846b5de2f95bf965cecfb0fb883b7a75c4 Mon Sep 17 00:00:00 2001 From: samual Date: Mon, 12 Oct 2009 23:26:18 +0000 Subject: [PATCH] Use gender-neutral kill/suicide messages git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8115 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/ctf.qc | 2 +- data/qcsrc/server/g_damage.qc | 8 ++++---- data/qcsrc/server/nexball.qc | 2 +- data/qcsrc/server/race.qc | 4 ++-- data/qcsrc/server/vote.qc | 2 +- data/qcsrc/server/w_campingrifle.qc | 4 ++-- data/qcsrc/server/w_crylink.qc | 2 +- data/qcsrc/server/w_electro.qc | 2 +- data/qcsrc/server/w_laser.qc | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/data/qcsrc/server/ctf.qc b/data/qcsrc/server/ctf.qc index e0a30d157..1d40efcc2 100644 --- a/data/qcsrc/server/ctf.qc +++ b/data/qcsrc/server/ctf.qc @@ -467,7 +467,7 @@ void FlagTouch() 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) diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 9939bac99..c1fb0c9a6 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -274,11 +274,11 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) 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 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) 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) diff --git a/data/qcsrc/server/nexball.qc b/data/qcsrc/server/nexball.qc index 04e4278a2..3f8c3eaef 100644 --- a/data/qcsrc/server/nexball.qc +++ b/data/qcsrc/server/nexball.qc @@ -347,7 +347,7 @@ void GoalTouch (void) 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); diff --git a/data/qcsrc/server/race.qc b/data/qcsrc/server/race.qc index c4596ab2b..1513a28cd 100644 --- a/data/qcsrc/server/race.qc +++ b/data/qcsrc/server/race.qc @@ -180,7 +180,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid) 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 @@ void race_SendTime(entity e, float cp, float t, float tvalid) 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"); } diff --git a/data/qcsrc/server/vote.qc b/data/qcsrc/server/vote.qc index 63e5e633e..12196c3e1 100644 --- a/data/qcsrc/server/vote.qc +++ b/data/qcsrc/server/vote.qc @@ -221,7 +221,7 @@ float GameCommand_Vote(string s, entity e) { } 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")); diff --git a/data/qcsrc/server/w_campingrifle.qc b/data/qcsrc/server/w_campingrifle.qc index 82587d3ee..d83937f1d 100644 --- a/data/qcsrc/server/w_campingrifle.qc +++ b/data/qcsrc/server/w_campingrifle.qc @@ -194,9 +194,9 @@ float w_campingrifle(float req) 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) { diff --git a/data/qcsrc/server/w_crylink.qc b/data/qcsrc/server/w_crylink.qc index fe4507023..799435460 100644 --- a/data/qcsrc/server/w_crylink.qc +++ b/data/qcsrc/server/w_crylink.qc @@ -241,7 +241,7 @@ float w_crylink(float req) 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) { diff --git a/data/qcsrc/server/w_electro.qc b/data/qcsrc/server/w_electro.qc index ee216931d..fc657f4a7 100644 --- a/data/qcsrc/server/w_electro.qc +++ b/data/qcsrc/server/w_electro.qc @@ -271,7 +271,7 @@ float w_electro(float req) 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"; } diff --git a/data/qcsrc/server/w_laser.qc b/data/qcsrc/server/w_laser.qc index 510884ca8..35cca5de7 100644 --- a/data/qcsrc/server/w_laser.qc +++ b/data/qcsrc/server/w_laser.qc @@ -143,7 +143,7 @@ float w_laser(float req) 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 -- 2.39.2