zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-16 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed compilation.

Browse source 
# Conflicts:
#	src/c_console.cpp
This commit is contained in:
drfrag 2019-07-14 15:44:30 +02:00
parent 1fb5361a82
commit b92ceac25f
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/c_console.cpp
View file

@ -560,6 +560,11 @@ CUSTOM_CVAR (Int, msgmidcolor2, 4, CVAR_ARCHIVE)
setmsgcolor (PRINTLEVELS+1, self);
}
FFont * C_GetDefaultHUDFont()
{
return SmallFont;
}
static void maybedrawnow (bool tick, bool force)
{
// FIXME: Does not work right with hw2d

2
src/intermission/intermission.cpp
View file

@ -84,7 +84,7 @@ void DrawFullscreenSubtitle(const char *text)
if (!text || !*text || !inter_subtitles) return;
// This uses the same scaling as regular HUD messages
auto scale = active_con_scaletext(generic_ui);
auto scale = active_con_scaletext();
int hudwidth = SCREENWIDTH / scale;
int hudheight = SCREENHEIGHT / scale;
FFont *font = C_GetDefaultHUDFont();

1
src/intermission/intermission.h
View file

@ -7,6 +7,7 @@
#include "textures/textures.h"
#include "s_sound.h"
#include "v_font.h"
#include "v_text.h"
struct event_t;

2
src/v_font.h
View file

@ -170,4 +170,6 @@ EColorRange V_ParseFontColor (const uint8_t *&color_value, int normalcolor, int
FFont *V_GetFont(const char *fontname, const char *fontlumpname = nullptr);
void V_InitFontColors();
FFont * C_GetDefaultHUDFont();
#endif //__V_FONT_H__