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
config/menus_settings.cfg
+2 -1
View File
@@ -450,6 +450,7 @@ alias askquit 1
alias showmenuonstartup 1
alias menufilesort_cgz 0
alias menufilesort_dmo 0
tempalias __fontlist [ default serif mono ]
tempalias __screenshottypes ["JPEG (Terrible Quality)" "JPEG (Bad Quality)" "JPEG (Good Quality)" "JPEG (Best Quality)" "PNG (Lossless)" "BMP (Lossless)"]
tempalias __getscreenshottype [
@@ -472,7 +473,7 @@ menuitemslider [Servers to ping at once: ] 0 50 "$maxservpings" 5 [] [ maxservpi
menuitemslider [Milliseconds between pinging servers: ] 1000 60000 "$servpingrate" 1000 [] [ servpingrate $arg1 ]
menuitemslider [Screenshot type: ] 0 5 __getscreenshottype 1 $__screenshottypes [ screenshottype (at "1 1 1 1 2 0" $arg1) ; if (< $arg1 4) [ jpegquality (at [50 70 85 100] $arg1) ] ]
menuitemslider [Console size: ] 0 20 "$consize" 1 [] [ consize $arg1 ]
menuitemslider [Font type: ] 0 2 "$__fontsetting" 1 [Default Serif Monospace] [ if (= $arg1 1) [ setfont serif ] [ if (= $arg1 2) [ setfont mono ] [ setfont default ] ] ]
menuitemslider [Font type: ] 0 2 [findlist $__fontlist (curfont)] 1 [Default Serif Monospace] [ setfont (at $__fontlist $arg1) ]
menuitemslider [Mini-map background style: ] 0 2 "$showmapbackdrop" 1 ["Fully Transparent" Black White/Transparent] [ showmapbackdrop $arg1 ]
menuitemslider [Menu map file sort order: ] 0 (- (listlen (listoptions menufilesortorders)) 1) "$menufilesort_cgz" 1 (listoptions menufilesortorders) [menufilesort_cgz = $arg1]
menuitemslider [Menu demo file sort order: ] 0 (- (listlen (listoptions menufilesortorders)) 1) "$menufilesort_dmo" 1 (listoptions menufilesortorders) [menufilesort_dmo = $arg1]
source/src/command.cpp
+1 -2
View File
@@ -1530,8 +1530,7 @@ void writecfg()
}
extern int lowfps, highfps;
f->printf("fpsrange %d %d\n", lowfps, highfps);
extern string myfont;
f->printf("setfont %s\n", myfont);
if(curfont && curfont->name) f->printf("setfont %s\n", curfont->name);
f->printf("\n");
audiomgr.writesoundconfig(f);
f->printf("\n");
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)
{