RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: platform: sdl: load .ico file with wide function allowing for icons to be loaded from non-latin game directory

Browse Source
This commit is contained in:
Alibek Omarov
2025-04-21 19:57:31 +03:00
parent 6ecaea3102
commit ca6ca8450b
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
engine/platform/sdl/vid_sdl.c
View File

@@ -660,14 +660,25 @@ static void VID_SetWindowIcon( SDL_Window *hWnd )
rgbdata_t *icon = NULL;
char iconpath[MAX_STRING];
#if XASH_WIN32 // ICO support only for Win32
const char *localIcoPath;
HINSTANCE hInst = GetModuleHandle( NULL );
const char *disk_iconpath = FS_GetDiskPath( GI->iconpath, true );
if(( localIcoPath = FS_GetDiskPath( GI->iconpath, true )))
if( disk_iconpath )
{
HICON ico = (HICON)LoadImage( NULL, localIcoPath, IMAGE_ICON, 0, 0, LR_LOADFROMFILE|LR_DEFAULTSIZE );
if( ico && WIN_SetWindowIcon( ico ))
return;
int len = MultiByteToWideChar( CP_UTF8, 0, disk_iconpath, -1, NULL, 0 );
if( len >= 0 )
{
wchar_t *path = malloc( len * sizeof( *path ));
HICON ico;
MultiByteToWideChar( CP_UTF8, 0, disk_iconpath, -1, path, len );
ico = (HICON)LoadImageW( NULL, path, IMAGE_ICON, 0, 0, LR_LOADFROMFILE|LR_DEFAULTSIZE );
free( path );
if( ico && WIN_SetWindowIcon( ico ))
return;
}
}
#endif // XASH_WIN32
@@ -679,21 +690,20 @@ static void VID_SetWindowIcon( SDL_Window *hWnd )
{
SDL_Surface *surface = SDL_CreateRGBSurfaceFrom( icon->buffer,
icon->width, icon->height, 32, 4 * icon->width,
0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000 );
0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000 );
FS_FreeImage( icon );
if( surface )
{
SDL_SetWindowIcon( host.hWnd, surface );
SDL_FreeSurface( surface );
FS_FreeImage( icon );
return;
}
FS_FreeImage( icon );
}
#if XASH_WIN32 // ICO support only for Win32
WIN_SetWindowIcon( LoadIcon( hInst, MAKEINTRESOURCE( 101 )));
WIN_SetWindowIcon( LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( 101 )));
#endif
}
#endif // SDL_VERSION_ATLEAST( 2, 0, 0 )