mirror of
https://git.code.sf.net/p/quake/nuq
synced 2025-02-12 15:15:40 +00:00
force color 255 to black and fix x11 handling when the display can't be had
This commit is contained in:
parent
258cceffee
commit
1900df8da6
2 changed files with 6 additions and 3 deletions
|
@ -164,13 +164,13 @@ x11_open_display( void )
|
|||
{
|
||||
if ( !x_disp ) {
|
||||
x_disp = XOpenDisplay( NULL );
|
||||
x_screen = DefaultScreen (x_disp);
|
||||
x_root = RootWindow (x_disp, x_screen);
|
||||
|
||||
if ( !x_disp ) {
|
||||
Sys_Error("x11_open_display: Could not open display [%s]\n", XDisplayName( NULL ));
|
||||
}
|
||||
|
||||
x_screen = DefaultScreen (x_disp);
|
||||
x_root = RootWindow (x_disp, x_screen);
|
||||
|
||||
// catch signals
|
||||
signal(SIGHUP, TragicDeath);
|
||||
signal(SIGINT, TragicDeath);
|
||||
|
|
|
@ -940,6 +940,9 @@ void Host_Init (quakeparms_t *parms)
|
|||
host_basepal = (byte *)COM_LoadHunkFile ("gfx/palette.lmp");
|
||||
if (!host_basepal)
|
||||
Sys_Error ("Couldn't load gfx/palette.lmp");
|
||||
host_basepal[765] =
|
||||
host_basepal[766] =
|
||||
host_basepal[767] = 0; // LordHavoc: force the transparent color to black
|
||||
host_colormap = (byte *)COM_LoadHunkFile ("gfx/colormap.lmp");
|
||||
if (!host_colormap)
|
||||
Sys_Error ("Couldn't load gfx/colormap.lmp");
|
||||
|
|
Loading…
Reference in a new issue