Fix scoreboard being shown in GUI on tab key

This commit is contained in:
Vortrex
2020-12-29 00:17:22 -06:00
parent 1b0a0c09f4
commit 5391d996a4

View File

@@ -23,58 +23,60 @@ bindEventHandler("OnResourceReady", thisResource, function(event, resource) {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
addEventHandler("OnDrawnHUD", function (event) { addEventHandler("OnDrawnHUD", function (event) {
if(isKeyDown(SDLK_TAB)) { if(localPlayer != null) {
if(listFont != null && titleFont != null) { if(isKeyDown(SDLK_TAB)) {
let scoreboardStart = (game.height/2)-(Math.floor(getClients().length/2)*20); if(listFont != null && titleFont != null) {
let titleSize = titleFont.measure("PLAYERS", game.width, 0.0, 1.0, 10, false, false); let scoreboardStart = (game.height/2)-(Math.floor(getClients().length/2)*20);
titleFont.render("PLAYERS", [game.width/2, scoreboardStart-50], 0, 0.5, 0.0, titleFont.size, COLOUR_WHITE, false, false, false, true); let titleSize = titleFont.measure("PLAYERS", game.width, 0.0, 1.0, 10, false, false);
titleFont.render("PLAYERS", [game.width/2, scoreboardStart-50], 0, 0.5, 0.0, titleFont.size, COLOUR_WHITE, false, false, false, true);
titleSize = titleFont.measure("____________________________", game.width, 0.0, 1.0, 10, false, false); titleSize = titleFont.measure("____________________________", game.width, 0.0, 1.0, 10, false, false);
titleFont.render("____________________________", [game.width/2, scoreboardStart-35], 0, 0.5, 0.0, titleFont.size, COLOUR_WHITE, false, false, false, true); titleFont.render("____________________________", [game.width/2, scoreboardStart-35], 0, 0.5, 0.0, titleFont.size, COLOUR_WHITE, false, false, false, true);
let clients = getClients(); let clients = getClients();
for(let i in clients) { for(let i in clients) {
if(!clients[i].console) { if(!clients[i].console) {
let name = clients[i].name; let name = clients[i].name;
let colour = COLOUR_WHITE; let colour = COLOUR_WHITE;
let paused = false; let paused = false;
let ping = "-1"; let ping = "-1";
if(typeof playerNames[clients[i].name] != "undefined") { if(typeof playerNames[clients[i].name] != "undefined") {
name = playerNames[clients[i].name]; name = playerNames[clients[i].name];
} }
if(typeof playerPaused[clients[i].name] != "undefined") { if(typeof playerPaused[clients[i].name] != "undefined") {
paused = playerPaused[clients[i].name]; paused = playerPaused[clients[i].name];
} }
if(typeof playerColours[clients[i].name] != "undefined") { if(typeof playerColours[clients[i].name] != "undefined") {
colour = playerColours[clients[i].name]; colour = playerColours[clients[i].name];
} }
if(typeof playerPing[clients[i].name] != "undefined") { if(typeof playerPing[clients[i].name] != "undefined") {
ping = toString(playerPing[clients[i].name]); ping = toString(playerPing[clients[i].name]);
} }
// Player ID // Player ID
let text = String(clients[i].index); let text = String(clients[i].index);
let size = listFont.measure(text, 75, 0.0, 1.0, 10, false, false); let size = listFont.measure(text, 75, 0.0, 1.0, 10, false, false);
listFont.render(text, [game.width/2-100, scoreboardStart + (i*20)], 0, 0.5, 0.0, listFont.size, COLOUR_WHITE, false, false, false, true); listFont.render(text, [game.width/2-100, scoreboardStart + (i*20)], 0, 0.5, 0.0, listFont.size, COLOUR_WHITE, false, false, false, true);
// Player Name // Player Name
text = name; text = name;
size = listFont.measure(text, 100, 0.0, 1.0, 10, false, false); size = listFont.measure(text, 100, 0.0, 1.0, 10, false, false);
listFont.render(text, [game.width/2, scoreboardStart + (i*20)], 0, 0.5, 0.0, listFont.size, colour, false, false, false, true); listFont.render(text, [game.width/2, scoreboardStart + (i*20)], 0, 0.5, 0.0, listFont.size, colour, false, false, false, true);
// Ping // Ping
text = ping; text = ping;
size = listFont.measure(ping, 75, 0.0, 1.0, 10, false, false); size = listFont.measure(ping, 75, 0.0, 1.0, 10, false, false);
listFont.render(ping, [game.width/2+100, scoreboardStart + (i*20)], 0, 0.5, 0.0, listFont.size, COLOUR_WHITE, false, false, false, true); listFont.render(ping, [game.width/2+100, scoreboardStart + (i*20)], 0, 0.5, 0.0, listFont.size, COLOUR_WHITE, false, false, false, true);
// PAUSED Status (depends on resource "afk") // PAUSED Status (depends on resource "afk")
if(paused == true) { if(paused == true) {
size = listFont.measure("PAUSED", 100, 0.0, 1.0, 10, false, false); size = listFont.measure("PAUSED", 100, 0.0, 1.0, 10, false, false);
listFont.render("PAUSED", [game.width/2+200, scoreboardStart + (i*20)], 0, 0.5, 0.0, listFont.size, pausedColour, false, false, false, true); listFont.render("PAUSED", [game.width/2+200, scoreboardStart + (i*20)], 0, 0.5, 0.0, listFont.size, pausedColour, false, false, false, true);
}
} }
} }
} }