Half-Life-RTX
/
xash3d-fwgs
mirror of https://github.com/w23/xash3d-fwgs
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix random crashes on map load 

how about not freeing stuff and then trying to use it?
This commit is contained in:
Ivan Avdeev 2021-11-25 15:08:16 -08:00
parent f0aaa3cd10
commit c2748ff034
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ref_vk/vk_textures.c
View File

@ -943,6 +943,7 @@ void XVK_SetupSky( const char *skyboxname )
char sidename[MAX_STRING];
int i, result, len;
rgbdata_t *sides[6];
qboolean success = false;
if( !COM_CheckString( skyboxname ))
{
@ -993,23 +994,25 @@ void XVK_SetupSky( const char *skyboxname )
gEngine.Con_DPrintf( "%s%s%s", skyboxname, g_skybox_info[i].suffix, i != 5 ? ", " : ". " );
}
if( i != 6 )
goto cleanup;
if( !Common_CheckTexName( loadname ))
goto cleanup;
Q_strncpy( tglob.skybox_cube.name, loadname, sizeof( tglob.skybox_cube.name ));
success = uploadTexture(&tglob.skybox_cube, sides, 6, true);
cleanup:
for (int j = 0; j < i; ++j)
gEngine.FS_FreeImage( sides[j] ); // release source texture
if( i != 6 )
goto fail;
if( !Common_CheckTexName( loadname ))
goto fail;
Q_strncpy( tglob.skybox_cube.name, loadname, sizeof( tglob.skybox_cube.name ));
if (uploadTexture(&tglob.skybox_cube, sides, 6, true)) {
if (success) {
tglob.fCustomSkybox = true;
gEngine.Con_DPrintf( "done\n" );
return; // loaded
} else {
tglob.skybox_cube.name[0] = '\0';
gEngine.Con_DPrintf( "^2failed\n" );
unloadSkybox();
}
fail:
gEngine.Con_DPrintf( "^2failed\n" );
unloadSkybox();
}