nuclide-ports/ts
nuclide-ports
/
ts
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compilation issues against latest Nuclide.

This commit is contained in:
Marco Cawthorne 2021-11-03 22:15:23 +01:00
parent 6a711ee759
commit 59ed4d99e9
Signed by: eukara
GPG Key ID: C196CD8BA993248A
2 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/ui.qc
View File

@ -401,9 +401,9 @@ UI_CheckMouse(vector vPos, vector vReg)
void
Font_Load_Easy(string strFontPath, int iFontScale, font_s &fntNew)
{
fntNew.iScale = iFontScale;
fntNew.iScaleX = fntNew.iScaleY = iFontScale;
fntNew.vecColor = [1,1,1];
fntNew.flAlpha = 1.0f;
fntNew.iFlags = 0;
fntNew.iID = (int)loadfont("", strFontPath, ftos((float)fntNew.iScale), -1, 0, 0);
fntNew.iID = (int)loadfont("", strFontPath, ftos((float)fntNew.iScaleY), -1, 0, 0);
}

42
src/client/util.qc
View File

@ -174,48 +174,6 @@ Gfx_ScalePicPreserveBounds(string sImage, vector arg_vDrawPos, vector vSize, vec
}
// Cloned from src/menu-fn/w_label.qc
string
Colors_RGB8_to_HEX(vector color)
{
string out = "^x";
//string out = "";
for (int i = 0; i < 3; i++) {
string a = "";
float b = rint(color[i] * 15);
switch (b) {
case 10:
a = "A";
break;
case 11:
a = "B";
break;
case 12:
a = "C";
break;
case 13:
a = "D";
break;
case 14:
a = "E";
break;
case 15:
a = "F";
break;
default:
a = ftos(b);
}
out = sprintf("%s%s", out, a);
}
return out;
}
// Load the map description
// Do we have any use for this though? Check original TS, the "Select Team"
// screen does (press enter to close or after closing the MoTD, probably)