YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

Fix R_CollectRendererNames

Browse Source 
Previously R_CollectRendererNames left gaps in the `ref` subarrays.
This caused `R_Init` to fail in some cases because it iterates between `0` and `ref.numRenderers`.
This commit is contained in:
Gleb Mazovetskiy 2021-01-07 10:07:09 +00:00 committed by Alibek Omarov
parent 6d614e028a
commit 12b579bc34
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engine/client/ref_common.c
View File

@ -586,10 +586,9 @@ static void SetFullscreenModeFromCommandLine( void )
void R_CollectRendererNames( void ) void R_CollectRendererNames( void )
{ {
const char *renderers[] = DEFAULT_RENDERERS; const char *renderers[] = DEFAULT_RENDERERS;
int i; int i, cur;
ref.numRenderers = 0;
cur = 0;
for( i = 0; i < DEFAULT_RENDERERS_LEN; i++ ) for( i = 0; i < DEFAULT_RENDERERS_LEN; i++ )
{ {
string temp; string temp;
@ -612,26 +611,27 @@ void R_CollectRendererNames( void )
continue; continue;
} }
Q_strncpy( ref.shortNames[i], renderers[i], sizeof( ref.shortNames[i] )); Q_strncpy( ref.shortNames[cur], renderers[i], sizeof( ref.shortNames[cur] ));
pfn = COM_GetProcAddress( dll, GET_REF_HUMANREADABLE_NAME ); pfn = COM_GetProcAddress( dll, GET_REF_HUMANREADABLE_NAME );
if( !pfn ) // just in case if( !pfn ) // just in case
{ {
Con_Reportf( "R_CollectRendererNames: can't find GetHumanReadableName export in %s\n", temp ); Con_Reportf( "R_CollectRendererNames: can't find GetHumanReadableName export in %s\n", temp );
Q_strncpy( ref.readableNames[i], renderers[i], sizeof( ref.readableNames[i] )); Q_strncpy( ref.readableNames[cur], renderers[i], sizeof( ref.readableNames[cur] ));
} }
else else
{ {
REF_HUMANREADABLE_NAME GetHumanReadableName = (REF_HUMANREADABLE_NAME)pfn; REF_HUMANREADABLE_NAME GetHumanReadableName = (REF_HUMANREADABLE_NAME)pfn;
GetHumanReadableName( ref.readableNames[i], sizeof( ref.readableNames[i] )); GetHumanReadableName( ref.readableNames[cur], sizeof( ref.readableNames[cur] ));
} }
Con_Printf( "Found renderer %s: %s\n", ref.shortNames[i], ref.readableNames[i] ); Con_Printf( "Found renderer %s: %s\n", ref.shortNames[cur], ref.readableNames[cur] );
ref.numRenderers++; cur++;
COM_FreeLibrary( dll ); COM_FreeLibrary( dll );
} }
ref.numRenderers = cur;
} }
qboolean R_Init( void ) qboolean R_Init( void )