TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Shrink a_gamefont_conf::name

Browse source 
Callers always load a DOS 8.3 filename into name, so shrink it from
64 characters to 16 characters.
This commit is contained in:
Kp 2023-05-20 16:37:26 +00:00
parent 03e12fedd4
commit bd050d73b2
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
similar/main/gamefont.cpp
View file

@ -73,9 +73,7 @@ struct a_gamefont_conf
{ {
int x; int x;
int y; int y;
union{ std::array<char, 16> name;
char name[64];//hrm.
} f;
}; };
struct gamefont_conf struct gamefont_conf
@ -96,9 +94,10 @@ static void gamefont_unloadfont(int gf)
static void gamefont_loadfont(grs_canvas &canvas, int gf, int fi) static void gamefont_loadfont(grs_canvas &canvas, int gf, int fi)
{ {
if (PHYSFSX_exists(font_conf[gf].font[fi].f.name,1)){ if (PHYSFS_exists(font_conf[gf].font[fi].name.data()))
{
gamefont_unloadfont(gf); gamefont_unloadfont(gf);
Gamefonts[gf] = gr_init_font(canvas, font_conf[gf].font[fi].f.name); Gamefonts[gf] = gr_init_font(canvas, font_conf[gf].font[fi].name.data());
}else { }else {
if (!Gamefonts[gf]){ if (!Gamefonts[gf]){
font_conf[gf].cur=-1; font_conf[gf].cur=-1;
@ -160,16 +159,16 @@ void gamefont_choose_game_font(int scrx,int scry){
namespace { namespace {
static void addfontconf(int gf, int x, int y, const char *const fn) static void addfontconf(int gf, int x, int y, const std::span<const char, 16> fn)
{ {
if (!PHYSFSX_exists(fn,1)) if (!PHYSFS_exists(fn.data()))
return; return;
for (int i=0;i<font_conf[gf].num;i++){ for (int i=0;i<font_conf[gf].num;i++){
if (font_conf[gf].font[i].x==x && font_conf[gf].font[i].y==y){ if (font_conf[gf].font[i].x==x && font_conf[gf].font[i].y==y){
if (i==font_conf[gf].cur) if (i==font_conf[gf].cur)
gamefont_unloadfont(gf); gamefont_unloadfont(gf);
strcpy(font_conf[gf].font[i].f.name,fn); std::memcpy(font_conf[gf].font[i].name.data(), fn.data(), fn.size());
if (i==font_conf[gf].cur) if (i==font_conf[gf].cur)
gamefont_loadfont(*grd_curcanv, gf, i); gamefont_loadfont(*grd_curcanv, gf, i);
return; return;
@ -177,7 +176,7 @@ static void addfontconf(int gf, int x, int y, const char *const fn)
} }
font_conf[gf].font[font_conf[gf].num].x=x; font_conf[gf].font[font_conf[gf].num].x=x;
font_conf[gf].font[font_conf[gf].num].y=y; font_conf[gf].font[font_conf[gf].num].y=y;
strcpy(font_conf[gf].font[font_conf[gf].num].f.name,fn); std::memcpy(font_conf[gf].font[font_conf[gf].num].name.data(), fn.data(), fn.size());
font_conf[gf].num++; font_conf[gf].num++;
} }