Skip to content

Commit 33e8727

Browse files
authored
Fix broken unicode text in player squad list (#1129)
1 parent 1bd39ed commit 33e8727

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/game/client/neo/ui/neo_hud_ammo.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ void CNEOHud_Ammo::DrawAmmo() const
143143
V_sprintf_safe(clipsText, "%d", numClips);
144144
}
145145

146-
textLen = V_strlen(clipsText);
147146
wchar_t unicodeClipsText[maxLen]{ L'\0' };
148147
g_pVGuiLocalize->ConvertANSIToUnicode(clipsText, unicodeClipsText, sizeof(unicodeClipsText));
149148

@@ -153,7 +152,7 @@ void CNEOHud_Ammo::DrawAmmo() const
153152

154153
surface()->GetTextSize(m_hTextFont, unicodeClipsText, fontWidth, fontHeight);
155154
surface()->DrawSetTextPos(digit2_xpos + xpos - fontWidth, digit2_ypos + ypos);
156-
surface()->DrawPrintText(unicodeClipsText, textLen);
155+
surface()->DrawPrintText(unicodeClipsText, V_wcslen(unicodeClipsText));
157156
}
158157

159158
const char* ammoChar = nullptr;
@@ -187,7 +186,7 @@ void CNEOHud_Ammo::DrawAmmo() const
187186

188187
surface()->DrawSetTextFont(m_hBulletFont);
189188
surface()->DrawSetTextPos(icon_xpos + xpos, icon_ypos + ypos);
190-
surface()->DrawPrintText(unicodeFireModeText, V_strlen(fireModeText));
189+
surface()->DrawPrintText(unicodeFireModeText, V_wcslen(unicodeFireModeText));
191190

192191
surface()->GetTextSize(m_hBulletFont, unicodeFireModeText, fireModeWidth, fireModeHeight);
193192
}

src/game/client/neo/ui/neo_hud_friendly_marker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void CNEOHud_FriendlyMarker::DrawPlayer(Color teamColor, C_NEO_Player *player, c
170170
int textWidth, textHeight;
171171
surface()->GetTextSize(m_hFont, textUTF, textWidth, textHeight);
172172
surface()->DrawSetTextPos(x - (textWidth / 2), y + (drawOutline ? 0 : m_iMarkerHeight) + textYOffset);
173-
surface()->DrawPrintText(textUTF, V_strlen(textASCII));
173+
surface()->DrawPrintText(textUTF, V_wcslen(textUTF));
174174
textYOffset += textHeight;
175175
};
176176

src/game/client/neo/ui/neo_hud_round_state.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ int CNEOHud_RoundState::DrawPlayerRow(int playerIndex, const int yOffset, bool s
733733
surface()->GetTextSize(m_hOCRSmallFont, m_wszPlayersAliveUnicode, fontWidth, fontHeight);
734734
surface()->DrawSetTextColor(isAlive ? COLOR_FADED_WHITE : COLOR_DARK_FADED_WHITE);
735735
surface()->DrawSetTextPos(8, yOffset);
736-
surface()->DrawPrintText(wSquadMateText, Q_strlen(squadMateText));
736+
surface()->DrawPrintText(wSquadMateText, V_wcslen(wSquadMateText));
737737

738738
return yOffset + fontHeight;
739739
}

0 commit comments

Comments
 (0)