Skip to content

Commit 5ad3185

Browse files
authored
Fix pronoun usage (ddnet#11690)
2 parents 2ca8008 + 6c4b05b commit 5ad3185

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

src/engine/client/discord.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class CDiscord : public IDiscord
157157
if(!m_Activity.instance)
158158
return;
159159

160-
// secret is only shared when player is joining the game, or when he's invited for private games
160+
// secret is only shared when player is joining the game, or when they are invited for private games
161161
if(str_length(ServerInfo.m_aAddress) < (int)sizeof(m_Activity.secrets.join))
162162
{
163163
str_copy(m_Activity.secrets.join, ServerInfo.m_aAddress, sizeof(m_Activity.secrets.join));

src/game/client/gameclient.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dumm
11471147
m_GameWorld.ReleaseHooked(pMsg->m_Victim);
11481148
}
11491149

1150-
// if we are spectating a static id set (team 0) and somebody killed, and its not a guy in solo, we remove him from the list
1150+
// if we are spectating a static id set (team 0) and somebody killed, and its not a guy in solo, we remove them from the list
11511151
// never remove players from the list if it is a pvp server
11521152
if(IsMultiViewIdSet() && m_MultiViewTeam == 0 && m_aMultiViewId[pMsg->m_Victim] && !m_aClients[pMsg->m_Victim].m_Spec && !m_MultiView.m_Solo && !m_GameInfo.m_Pvp)
11531153
{
@@ -4885,7 +4885,7 @@ void CGameClient::HandleMultiView()
48854885
// player is far away and frozen
48864886
if(distance(m_MultiView.m_OldPos, PlayerPos) > 1100 && m_aClients[ClientId].m_FreezeEnd != 0)
48874887
{
4888-
// check if the player is frozen for more than 3 seconds, if so vanish him
4888+
// check if the player is frozen for more than 3 seconds, if so vanish them
48894889
if(m_MultiView.m_aLastFreeze[ClientId] == 0.0f)
48904890
{
48914891
m_MultiView.m_aLastFreeze[ClientId] = Client()->LocalTime();

src/game/client/prediction/entities/character.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ void CCharacter::HandleNinja()
177177

178178
// Hit a player, give them damage and stuffs...
179179
GameWorld()->CreatePredictedSound(pChr->m_Pos, SOUND_NINJA_HIT, GetCid());
180-
// set his velocity to fast upward (for now)
180+
// set their velocity to fast upward (for now)
181181
dbg_assert(m_NumObjectsHit < MAX_CLIENTS, "m_aHitObjects overflow");
182182
m_aHitObjects[m_NumObjectsHit++] = ClientId;
183183

@@ -328,7 +328,7 @@ void CCharacter::FireWeapon()
328328
if((pTarget == this || !CanCollide(pTarget->GetCid())))
329329
continue;
330330

331-
// set his velocity to fast upward (for now)
331+
// set their velocity to fast upward (for now)
332332
if(length(pTarget->m_Pos - ProjStartPos) > 0.0f)
333333
GameWorld()->CreatePredictedHammerHitEvent(pTarget->m_Pos - normalize(pTarget->m_Pos - ProjStartPos) * GetProximityRadius() * 0.5f, GetCid());
334334
else
@@ -1122,12 +1122,12 @@ void CCharacter::DDRacePostCoreTick()
11221122
// following jump rules can be overridden by tiles, like Refill Jumps, Stopper and Wall Jump
11231123
if(m_Core.m_Jumps == -1)
11241124
{
1125-
// The player has only one ground jump, so his feet are always dark
1125+
// The player has only one ground jump, so their feet are always dark
11261126
m_Core.m_Jumped |= 2;
11271127
}
11281128
else if(m_Core.m_Jumps == 0)
11291129
{
1130-
// The player has no jumps at all, so his feet are always dark
1130+
// The player has no jumps at all, so their feet are always dark
11311131
m_Core.m_Jumped |= 2;
11321132
}
11331133
else if(m_Core.m_Jumps == 1 && m_Core.m_Jumped > 0)
@@ -1137,7 +1137,7 @@ void CCharacter::DDRacePostCoreTick()
11371137
}
11381138
else if(m_Core.m_JumpedTotal < m_Core.m_Jumps - 1 && m_Core.m_Jumped > 1)
11391139
{
1140-
// The player has not yet used up all his jumps, so his feet remain light
1140+
// The player has not yet used up all their jumps, so their feet remain light
11411141
m_Core.m_Jumped = 1;
11421142
}
11431143

src/game/server/ddracechat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1816,7 +1816,7 @@ void CGameContext::ConRescue(IConsole::IResult *pResult, void *pUserData)
18161816

18171817
if(pPlayer->m_RescueMode == RESCUEMODE_MANUAL)
18181818
{
1819-
// if character can't set his rescue state then we should rescue him instead
1819+
// if character can't set their rescue state then we should rescue them instead
18201820
GoRescue = !pChr->TrySetRescue(RESCUEMODE_MANUAL);
18211821
}
18221822

src/game/server/entities/character.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ void CCharacter::HandleNinja()
369369

370370
// Hit a player, give them damage and stuffs...
371371
GameServer()->CreateSound(pChr->m_Pos, SOUND_NINJA_HIT, TeamMask());
372-
// set his velocity to fast upward (for now)
372+
// set their velocity to fast upward (for now)
373373
dbg_assert(m_NumObjectsHit < MAX_CLIENTS, "m_aHitObjects overflow");
374374
m_aHitObjects[m_NumObjectsHit++] = ClientId;
375375

@@ -520,7 +520,7 @@ void CCharacter::FireWeapon()
520520
if((pTarget == this || (pTarget->IsAlive() && !CanCollide(pTarget->GetPlayer()->GetCid()))))
521521
continue;
522522

523-
// set his velocity to fast upward (for now)
523+
// set their velocity to fast upward (for now)
524524
if(length(pTarget->m_Pos - ProjStartPos) > 0.0f)
525525
GameServer()->CreateHammerHit(pTarget->m_Pos - normalize(pTarget->m_Pos - ProjStartPos) * GetProximityRadius() * 0.5f, TeamMask());
526526
else
@@ -1219,7 +1219,7 @@ bool CCharacter::IsSnappingCharacterInView(int SnappingClientId)
12191219
{
12201220
int Id = m_pPlayer->GetCid();
12211221

1222-
// A player may not be clipped away if his hook or a hook attached to him is in the field of view
1222+
// A player may not be clipped away if their hook or a hook attached to them is in the field of view
12231223
bool PlayerAndHookNotInView = NetworkClippedLine(SnappingClientId, m_Pos, m_Core.m_HookPos);
12241224
bool AttachedHookInView = false;
12251225
if(PlayerAndHookNotInView)
@@ -2263,12 +2263,12 @@ void CCharacter::DDRacePostCoreTick()
22632263
// following jump rules can be overridden by tiles, like Refill Jumps, Stopper and Wall Jump
22642264
if(m_Core.m_Jumps == -1)
22652265
{
2266-
// The player has only one ground jump, so his feet are always dark
2266+
// The player has only one ground jump, so their feet are always dark
22672267
m_Core.m_Jumped |= 2;
22682268
}
22692269
else if(m_Core.m_Jumps == 0)
22702270
{
2271-
// The player has no jumps at all, so his feet are always dark
2271+
// The player has no jumps at all, so their feet are always dark
22722272
m_Core.m_Jumped |= 2;
22732273
}
22742274
else if(m_Core.m_Jumps == 1 && m_Core.m_Jumped > 0)
@@ -2278,7 +2278,7 @@ void CCharacter::DDRacePostCoreTick()
22782278
}
22792279
else if(m_Core.m_JumpedTotal < m_Core.m_Jumps - 1 && m_Core.m_Jumped > 1)
22802280
{
2281-
// The player has not yet used up all his jumps, so his feet remain light
2281+
// The player has not yet used up all their jumps, so their feet remain light
22822282
m_Core.m_Jumped = 1;
22832283
}
22842284

src/game/server/gamecontroller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void IGameController::DoActivityCheck()
6464
break;
6565
case 1:
6666
{
67-
// move player to spectator if the reserved slots aren't filled yet, kick him otherwise
67+
// move player to spectator if the reserved slots aren't filled yet, kick them otherwise
6868
int Spectators = 0;
6969
for(auto &pPlayer : GameServer()->m_apPlayers)
7070
if(pPlayer && pPlayer->GetTeam() == TEAM_SPECTATORS)

src/game/server/teams.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void CGameTeams::OnCharacterStart(int ClientId)
116116
str_format(
117117
aBuf,
118118
sizeof(aBuf),
119-
"%s has finished and didn't go through start yet, wait for him or join another team.",
119+
"%s has finished and didn't go through start yet, wait for them or join another team.",
120120
Server()->ClientName(i));
121121
GameServer()->SendChatTarget(ClientId, aBuf);
122122
m_aLastChat[ClientId] = Tick;

0 commit comments

Comments
 (0)