Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Check if the renderer is loaded instead of checking if it's registered
Some checks failed
CodeQL / Analyze (push) Waiting to run
Details
Build branch / build-all (push) Failing after 43s
Details

Browse source
This commit is contained in:
smallmodel 2024-12-06 00:45:18 +01:00
parent 39981643a8
commit 6f686cb7fa
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
code/client/cl_main.cpp
View file

@ -3092,11 +3092,11 @@ int CL_GetRefSequence(void) {
/*
============
CL_IsRendererRegistered
CL_IsRendererLoaded
============
*/
qboolean CL_IsRendererRegistered(void) {
return cls.rendererRegistered;
qboolean CL_IsRendererLoaded(void) {
return re.Shutdown != NULL;
}
/*

2
code/client/cl_ui.cpp
View file

@ -3768,7 +3768,7 @@ void CL_FillUIImports(void)
uii.UI_CloseDMConsole = UI_CloseDMConsole;
uii.GetRefSequence = CL_GetRefSequence;
uii.IsRendererRegistered = CL_IsRendererRegistered;
uii.IsRendererLoaded = CL_IsRendererLoaded;
}
/*

2
code/client/client.h
View file

@ -560,7 +560,7 @@ void UI_LoadResource( const char *name );
qboolean CL_CheckPaused(void);
int CL_GetRefSequence(void);
qboolean CL_IsRendererRegistered(void);
qboolean CL_IsRendererLoaded(void);
//
// cl_input

2
code/uilib/ui_public.h
View file

@ -131,7 +131,7 @@ typedef struct uiimport_s {
// Added in OPM
//
int (*GetRefSequence)(void);
qboolean (*IsRendererRegistered)(void);
qboolean (*IsRendererLoaded)(void);
} uiimport_t;
#if 1

4
code/uilib/uifont.cpp
View file

@ -616,7 +616,7 @@ int UIFont::getHeight(const float* virtualScale)
if (m_font) {
return (m_font->sgl[0]->height * virtualScale[0]);
} else {
return (16.0 * uid.vidHeight * virtualScale[1]);
return (16.0 * virtualScale[1]);
}
} else {
if (m_font) {
@ -789,7 +789,7 @@ int UI_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
void UIFont::CheckRefreshFont() {
if (refHandle != uii.GetRefSequence()) {
setFont(name);
} else if (!uii.IsRendererRegistered()) {
} else if (!uii.IsRendererLoaded()) {
m_font = NULL;
}
}