# HG changeset patch # User Wuzzy # Date 1622207199 -7200 # Node ID acf70c44065bdf3e45547caea4a82a0049eba239 # Parent 8bb050e8e40f8d05d52272db641c90f959371000 Use the singular 'they' in code comments, where it makes sense diff -r 8bb050e8e40f -r acf70c44065b QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Fri May 28 14:18:52 2021 +0200 +++ b/QTfrontend/hwform.cpp Fri May 28 15:06:39 2021 +0200 @@ -1295,7 +1295,7 @@ void HWForm::NetAuthFailed() { - // Set the password blank if case the user tries to join and enter his password again + // Set the password blank if case the user tries to join and enter their password again config->clearTempHash(); //Try to login again diff -r 8bb050e8e40f -r acf70c44065b QTfrontend/ui/page/pagenetserver.cpp --- a/QTfrontend/ui/page/pagenetserver.cpp Fri May 28 14:18:52 2021 +0200 +++ b/QTfrontend/ui/page/pagenetserver.cpp Fri May 28 15:06:39 2021 +0200 @@ -122,7 +122,7 @@ sbPort->setValue(NETGAME_DEFAULT_PORT); } -// This function assumes that the user wants to share his server while connected to +// This function assumes that the user wants to share their server while connected to // the Internet and that he/she is using direct access (eg no NATs). To determine the // IP we briefly connect to Hedgewars website and fallback to user intervention // after 4 seconds of timeout. diff -r 8bb050e8e40f -r acf70c44065b gameServer/Actions.hs --- a/gameServer/Actions.hs Fri May 28 14:18:52 2021 +0200 +++ b/gameServer/Actions.hs Fri May 28 15:06:39 2021 +0200 @@ -129,7 +129,7 @@ mapM_ processAction [ AnswerClients [chan] ["BYE", msg] - , ModifyClient (\c -> c{nick = "", isVisible = False}) -- this will effectively hide client from others while he isn't deleted from list + , ModifyClient (\c -> c{nick = "", isVisible = False}) -- this will effectively hide client from others while it isn't deleted from list ] s <- get diff -r 8bb050e8e40f -r acf70c44065b hedgewars/uGearsUtils.pas --- a/hedgewars/uGearsUtils.pas Fri May 28 14:18:52 2021 +0200 +++ b/hedgewars/uGearsUtils.pas Fri May 28 15:06:39 2021 +0200 @@ -1361,7 +1361,7 @@ begin (* Conditions for not activating. - 1. Hog is last of his clan + 1. Hog is last of their clan 2. Sudden Death is in play 3. Hog is a king *) diff -r 8bb050e8e40f -r acf70c44065b share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua Fri May 28 14:18:52 2021 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua Fri May 28 15:06:39 2021 +0200 @@ -49,9 +49,9 @@ -- 0.3 --------- -- [fufufufu kamikaze fix] --- added nill checks to make sure the player doesn't generate errors by producing a nil value in hhs[] when he uses kamikaze +-- added nil checks to make sure the player doesn't generate errors by producing a nil value in hhs[] when using kamikaze -- added a check to make sure the player doesn't kamikaze straight down and make the flag's starting point underwater --- added a check to make sure the player drops the flag if he has it and he uses kamikaze +-- added a check to make sure the player drops the flag if they have it and they use kamikaze -------- -- 0.4 @@ -62,7 +62,7 @@ -- fix piano strike exploit -- changed delay to allow for better portals -- changed starting feedback a little --- increased the radius around the circle indicating the flag thief so that it doesn't obscure his health +-- increased the radius around the circle indicating the flag thief so that it doesn't obscure their health -------- -- 0.5 @@ -597,7 +597,7 @@ function onGearResurrect(gear) if GetGearType(gear) == gtHedgehog then - -- mark the flag thief as dead if he needed a respawn + -- mark the flag thief as dead if they needed a respawn for i = 0, ClansCount-1 do if gear == fThief[i] then FlagThiefDead(gear) diff -r 8bb050e8e40f -r acf70c44065b share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua Fri May 28 14:18:52 2021 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua Fri May 28 15:06:39 2021 +0200 @@ -323,13 +323,13 @@ if currHog ~= lastHog then - -- re-assign ammo to this guy, so that his entire ammo set will + -- re-assign ammo to this fellow, so that their entire ammo set will -- be visible during another player's turn if lastHog ~= nil and GetHealth(lastHog) then ConvertValues(lastHog) end - -- give the new hog what he is supposed to have, too + -- give the new hog what they are supposed to have, too ConvertValues(CurrentHedgehog) end diff -r 8bb050e8e40f -r acf70c44065b share/hedgewars/Data/Scripts/Multiplayer/Racer.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua Fri May 28 14:18:52 2021 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua Fri May 28 15:06:39 2021 +0200 @@ -977,7 +977,7 @@ waypointCursor = false end - -- has the player started his tumbling spree? + -- has the player started? if (CurrentHedgehog ~= nil) then --airstrike conversion used to be here @@ -1010,7 +1010,7 @@ end - -- if the player has expended his tunbling time, stop him tumbling + -- if the player has expended their time, stop if TurnTimeLeft <= 20 and not turnSkipped then DisableTumbler() end diff -r 8bb050e8e40f -r acf70c44065b share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua Fri May 28 14:18:52 2021 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua Fri May 28 15:06:39 2021 +0200 @@ -203,7 +203,7 @@ -- hog awards SI.awardRoundScore = nil -- hog with most score in 1 round (min. 50) SI.awardRoundKills = nil -- most kills in 1 round (min. 5) -SI.awardAccuracy = nil -- awarded to hog who didn’t miss once in his round, with most kills (min. 5) +SI.awardAccuracy = nil -- awarded to hog who didn’t miss once in their round, with most kills (min. 5) SI.awardCombo = nil -- hog with longest combo (min. 5) diff -r 8bb050e8e40f -r acf70c44065b share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua Fri May 28 14:18:52 2021 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua Fri May 28 15:06:39 2021 +0200 @@ -1047,7 +1047,7 @@ end - -- start the player tumbling with a boom once their turn has actually begun + -- start the player with a boom once their turn has actually begun if racerActive == false then if (TurnTimeLeft > 0) and (TurnTimeLeft ~= TurnTime) then @@ -1076,7 +1076,7 @@ activationStage = 202 end - -- has the player started his tumbling spree? + -- has the player started? if (CurrentHedgehog ~= nil) then -- if the RACE has started, show tracktimes and keep tabs on waypoints diff -r 8bb050e8e40f -r acf70c44065b share/hedgewars/Data/Scripts/Multiplayer/WxW.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/WxW.lua Fri May 28 14:18:52 2021 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/WxW.lua Fri May 28 15:06:39 2021 +0200 @@ -118,7 +118,7 @@ ABL: All But Last: Players must not only attack the team with the lowest total health KTL: Kill The Leader: If players hit some enemy hedgehog, at least one of them must be a hog from the team with the highest total health. - The ABL and KTL rules exclude each other. If a player breaks the rule (if enabled), he must + The ABL and KTL rules exclude each other. If a player breaks the rule (if enabled), they must skip in the next round. SW false Super Weapons: A few crates may contain very powerful weapons (melon, hellish grenade, RC plane, ballgun) maxcrates 12 Number of crates which can be at maximum in the game (limited to up to 100 to avoid lag)