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

Enable gr_remap_color_fonts in D1

Browse source 
This looks like a useful fix that was developed after Descent 1 was
released.  Backport it.  This reduces differences between the engines.
This commit is contained in:
Kp 2015-12-18 04:08:24 +00:00
parent 28ee4c1804
commit e59fde57e7
2 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/include/fwd-gr.h
View file

@ -249,15 +249,10 @@ namespace dsx {
#if defined(DXX_BUILD_DESCENT_I)
#define DXX_SDL_WINDOW_CAPTION "Descent"
#define DXX_SDL_WINDOW_ICON_BITMAP "d1x-rebirth.bmp"
static inline void gr_remap_color_fonts() {}
#elif defined(DXX_BUILD_DESCENT_II)
#define DXX_SDL_WINDOW_CAPTION "Descent II"
#define DXX_SDL_WINDOW_ICON_BITMAP "d2x-rebirth.bmp"
void gr_copy_palette(palette_array_t &gr_palette, const palette_array_t &pal);
//remap (by re-reading) all the color fonts
void gr_remap_color_fonts();
#endif
}
@ -265,6 +260,9 @@ void gr_remap_color_fonts();
// Writes a string using current font. Returns the next column after last char.
namespace dcx {
//remap (by re-reading) all the color fonts
void gr_remap_color_fonts();
void gr_set_curfont(const grs_font *);
void gr_set_fontcolor(int fg_color, int bg_color);
void gr_string(int x, int y, const char *s);

20
similar/2d/font.cpp
View file

@ -867,11 +867,6 @@ void gr_close_font(std::unique_ptr<grs_font> font)
}
}
}
#if defined(DXX_BUILD_DESCENT_II)
namespace dsx {
//remap a font, re-reading its data & palette
static void gr_remap_font( grs_font *font, const char * fontname, uint8_t *font_data );
@ -886,11 +881,6 @@ void gr_remap_color_fonts()
}
}
}
#endif
namespace dcx {
/*
* reads a grs_font structure from a PHYSFS_file
*/
@ -1051,11 +1041,6 @@ grs_font_ptr gr_init_font( const char * fontname )
return grs_font_ptr(font.release());
}
}
#if defined(DXX_BUILD_DESCENT_II)
namespace dsx {
//remap a font by re-reading its data & palette
void gr_remap_font( grs_font *font, const char * fontname, uint8_t *font_data )
{
@ -1131,11 +1116,6 @@ void gr_remap_font( grs_font *font, const char * fontname, uint8_t *font_data )
#endif
}
}
#endif
namespace dcx {
void gr_set_curfont(const grs_font *n)
{
grd_curcanv->cv_font = n;