kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove __fontsetting

Browse Source 
instead, "curfont" returns name of current font

DOCREF __fontsetting curfont
This commit is contained in:
ac-stef
2016-08-26 14:30:29 +02:00
parent f730106c56
commit daae49273d
3 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/rendertext.cpp
+2 -16
View File
@@ -10,7 +10,6 @@ static font *fontdef = NULL;
font *curfont = NULL;
VARP(allowblinkingtext, 0, 0, 1); // if you're so inclined
VARP(__fontsetting, 0, 0, 2);
void newfont(char *name, char *tex, int *defaultw, int *defaulth, int *offsetx, int *offsety, int *offsetw, int *offseth)
{
@@ -59,28 +58,15 @@ COMMANDN(font, newfont, "ssiiiiii");
COMMAND(fontchar, "iiii");
COMMAND(fontskip, "i");
string myfont = "default";
void newsetfont(const char *name)
{
if ( setfont(name) ) copystring(myfont,name);
}
bool setfont(const char *name)
{
font *f = fonts.access(name);
if(!f) return false;
int v = -1;
if(strcmp(name, "default")==0)
v = 0;
else if(strcmp(name, "serif")==0)
v = 1;
else if(strcmp(name, "mono")==0)
v = 2;
if(v!=-1) __fontsetting = v;
curfont = f;
return true;
}
COMMANDN(setfont, newsetfont, "s");
COMMANDF(setfont, "s", (char *name) { setfont(name); });
COMMANDF(curfont, "", () { result(curfont && curfont->name ? curfont->name : ""); });
font *getfont(const char *name)
{