thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-12-23 08:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

escape player names everywhere

Browse source
This commit is contained in:
RandomityGuy 2025-11-11 00:41:08 +00:00
parent 60d1006f69
commit 352f2a5bc3
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/LeaderboardsGui.hx
View file

@ -195,7 +195,7 @@ class LeaderboardsGui extends GuiImage {
for (score in scoreList) { for (score in scoreList) {
var scoreText = '<offset value="10">${i}. </offset> var scoreText = '<offset value="10">${i}. </offset>
<offset value="50">${score.name}</offset> <offset value="50">${StringTools.htmlEscape(score.name)}</offset>
<offset value="375">${score.rewind > 0 ? "<img src='rewind'/>" : ""}</offset> <offset value="375">${score.rewind > 0 ? "<img src='rewind'/>" : ""}</offset>
<offset value="400">${isHuntScore ? Std.string(1000 - score.score) : Util.formatTime(score.score)}</offset> <offset value="400">${isHuntScore ? Std.string(1000 - score.score) : Util.formatTime(score.score)}</offset>
<offset value="500">${score.rating}</offset> <offset value="500">${score.rating}</offset>
@ -203,7 +203,7 @@ class LeaderboardsGui extends GuiImage {
if (levelSelectDifficulty == "customs") { if (levelSelectDifficulty == "customs") {
scoreText = '<offset value="10">${i}. </offset> scoreText = '<offset value="10">${i}. </offset>
<offset value="50">${score.name}</offset> <offset value="50">${StringTools.htmlEscape(score.name)}</offset>
<offset value="475">${score.rewind > 0 ? "<img src='rewind'/>" : ""}</offset> <offset value="475">${score.rewind > 0 ? "<img src='rewind'/>" : ""}</offset>
<offset value="500">${isHuntScore ? Std.string(1000 - score.score) : Util.formatTime(score.score)}</offset> <offset value="500">${isHuntScore ? Std.string(1000 - score.score) : Util.formatTime(score.score)}</offset>
<offset value="625"><img src="${platformToString(score.platform)}"/></offset>'; <offset value="625"><img src="${platformToString(score.platform)}"/></offset>';
@ -232,7 +232,7 @@ class LeaderboardsGui extends GuiImage {
for (score in scoreList) { for (score in scoreList) {
var scoreText = '<offset value="10">${i}. </offset> var scoreText = '<offset value="10">${i}. </offset>
<offset value="50">${score.name}</offset> <offset value="50">${StringTools.htmlEscape(score.name)}</offset>
<offset value="575">${score.rating}</offset>'; <offset value="575">${score.rating}</offset>';
scoreTexts.push(scoreText); scoreTexts.push(scoreText);
i++; i++;

2
src/gui/MPServerListGui.hx
View file

@ -97,7 +97,7 @@ class MPServerListGui extends GuiImage {
function updateServerListDisplay() { function updateServerListDisplay() {
serverDisplays = ourServerList.map(x -> return serverDisplays = ourServerList.map(x -> return
'<img src="${platformToString[x.platform]}"></img><font color="#FFFFFF">${x.players}/${x.maxPlayers} ${x.name}</font>'); '<img src="${platformToString[x.platform]}"></img><font color="#FFFFFF">${x.players}/${x.maxPlayers} ${StringTools.htmlEscape(x.name)}</font>');
serverList.setTexts(serverDisplays); serverList.setTexts(serverDisplays);
} }

6
src/gui/MultiplayerLevelSelectGui.hx
View file

@ -212,7 +212,8 @@ class MultiplayerLevelSelectGui extends GuiImage {
innerCtrl.addChild(chatWnd); innerCtrl.addChild(chatWnd);
playerList = new GuiMLTextListCtrl(arial14, playerListArr.map(player -> { playerList = new GuiMLTextListCtrl(arial14, playerListArr.map(player -> {
return '<img src="${player.state ? "ready" : "notready"}"></img><img src="${platformToString(player.platform)}"></img>${player.name}'; return
'<img src="${player.state ? "ready" : "notready"}"></img><img src="${platformToString(player.platform)}"></img>${StringTools.htmlEscape(player.name)}';
}), imgLoader); }), imgLoader);
playerList.selectedColor = 0xF29515; playerList.selectedColor = 0xF29515;
playerList.selectedFillColor = 0xEBEBEB; playerList.selectedFillColor = 0xEBEBEB;
@ -504,7 +505,8 @@ class MultiplayerLevelSelectGui extends GuiImage {
if (!showingCustoms) if (!showingCustoms)
playerList.setTexts(playerListArr.map(player -> { playerList.setTexts(playerListArr.map(player -> {
return '<img src="${player.state ? "ready" : "notready"}"></img><img src="${platformToString(player.platform)}"></img>${player.name}'; return
'<img src="${player.state ? "ready" : "notready"}"></img><img src="${platformToString(player.platform)}"></img>${StringTools.htmlEscape(player.name)}';
})); }));
var pubCount = 1; // Self var pubCount = 1; // Self

12
src/gui/PlayGui.hx
View file

@ -728,9 +728,9 @@ class PlayGui {
var plShadowScores = []; var plShadowScores = [];
playerList.sort((a, b) -> a.score > b.score ? -1 : (a.score < b.score ? 1 : 0)); playerList.sort((a, b) -> a.score > b.score ? -1 : (a.score < b.score ? 1 : 0));
for (item in playerList) { for (item in playerList) {
pl.push('<font color="#EBEBEB"><img src="${item.us ? "us" : "them"}"></img>${Util.rightPad(item.name, 25, 3)}</font>'); pl.push('<font color="#EBEBEB"><img src="${item.us ? "us" : "them"}"></img>${Util.rightPad(StringTools.htmlEscape(item.name), 25, 3)}</font>');
plScores.push('<font color="#EBEBEB">${item.score}</font>'); plScores.push('<font color="#EBEBEB">${item.score}</font>');
plShadow.push('<font color="#000000"><img src="them"></img>${Util.rightPad(item.name, 25, 3)}</font>'); plShadow.push('<font color="#000000"><img src="them"></img>${Util.rightPad(StringTools.htmlEscape(item.name), 25, 3)}</font>');
plShadowScores.push('<font color="#000000">${item.score}</font>'); plShadowScores.push('<font color="#000000">${item.score}</font>');
} }
playerListCtrl.setTexts(pl); playerListCtrl.setTexts(pl);
@ -746,9 +746,9 @@ class PlayGui {
if (p2 == null) { if (p2 == null) {
var onePt = p1.score == 1; var onePt = p1.score == 1;
if (onePt) if (onePt)
MarbleGame.instance.world.displayAlert('${p1.name} won with 1 point!'); MarbleGame.instance.world.displayAlert('${StringTools.htmlEscape(p1.name)} won with 1 point!');
else else
MarbleGame.instance.world.displayAlert('${p1.name} won with ${p1.score} points!'); MarbleGame.instance.world.displayAlert('${StringTools.htmlEscape(p1.name)} won with ${p1.score} points!');
} else { } else {
var tie = p1.score == p2.score; var tie = p1.score == p2.score;
if (tie) { if (tie) {
@ -756,9 +756,9 @@ class PlayGui {
} else { } else {
var onePt = p1.score == 1; var onePt = p1.score == 1;
if (onePt) if (onePt)
MarbleGame.instance.world.displayAlert('${p1.name} won with 1 point!'); MarbleGame.instance.world.displayAlert('${StringTools.htmlEscape(p1.name)} won with 1 point!');
else else
MarbleGame.instance.world.displayAlert('${p1.name} won with ${p1.score} points!'); MarbleGame.instance.world.displayAlert('${StringTools.htmlEscape(p1.name)} won with ${p1.score} points!');
if (p1.id == Net.clientId) { // This us if (p1.id == Net.clientId) { // This us
AchievementsGui.queueMPAchievement(512); AchievementsGui.queueMPAchievement(512);