qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 16:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix the broken sdl/sdl32 hud

Browse source
This commit is contained in:
Bill Currie 2009-12-23 02:08:49 +00:00 • committed by Jeff Teunissen
parent 018a0b3bb6
commit 97f54e22df
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/console/client.c
View file

@ -827,13 +827,13 @@ C_Init (void)
con_debuglog = COM_CheckParm ("-condebug"); con_debuglog = COM_CheckParm ("-condebug");
// The console will get resized, so assume initial size is 320x200
con_data.view = view_new (0, 0, 320, 200, grav_northeast); con_data.view = view_new (0, 0, 320, 200, grav_northeast);
console_view = view_new (0, 0, 320, 200, grav_northwest); console_view = view_new (0, 0, 320, 200, grav_northwest);
say_view = view_new (0, 0, 320, 8, grav_northwest); say_view = view_new (0, 0, 320, 8, grav_northwest);
notify_view = view_new (0, 8, 320, 32, grav_northwest); notify_view = view_new (0, 8, 320, 32, grav_northwest);
menu_view = view_new (0, 0, 320, 200, grav_center); menu_view = view_new (0, 0, 320, 200, grav_center);
hud_view = view_new (0, 0, vid.conwidth, vid.conheight, grav_northeast); hud_view = view_new (0, 0, 320, 200, grav_northeast);
view_add (con_data.view, say_view); view_add (con_data.view, say_view);
view_add (con_data.view, notify_view); view_add (con_data.view, notify_view);

3
libs/video/targets/vid_sdl.c
View file

@ -110,7 +110,6 @@ VID_Init (unsigned char *palette)
// now know everything we need to know about the buffer // now know everything we need to know about the buffer
VGA_width = vid.width; VGA_width = vid.width;
VGA_height = vid.height; VGA_height = vid.height;
Con_CheckResize (); // Now that we have a window size, fix console
vid.numpages = 1; vid.numpages = 1;
vid.colormap8 = vid_colormap; vid.colormap8 = vid_colormap;
vid.fullbright = 256 - LittleLong (*((int *) vid.colormap8 + 2048)); vid.fullbright = 256 - LittleLong (*((int *) vid.colormap8 + 2048));
@ -123,6 +122,8 @@ VID_Init (unsigned char *palette)
VID_InitBuffers (); // allocate z buffer and surface cache VID_InitBuffers (); // allocate z buffer and surface cache
Con_CheckResize (); // Now that we have a window size, fix console
SDL_ShowCursor (0); // hide the mouse pointer SDL_ShowCursor (0); // hide the mouse pointer
#ifdef _WIN32 #ifdef _WIN32

3
libs/video/targets/vid_sdl32.c
View file

@ -151,7 +151,6 @@ VID_Init (unsigned char *palette)
// now we know everything we need to know about the buffer // now we know everything we need to know about the buffer
VGA_width = vid.width; VGA_width = vid.width;
VGA_height = vid.height; VGA_height = vid.height;
Con_CheckResize (); // Now that we have a window size, fix console
vid.numpages = 1; vid.numpages = 1;
if (vid_colormap) if (vid_colormap)
VID_MakeColormaps(256 - vid_colormap[16384], vid.palette); VID_MakeColormaps(256 - vid_colormap[16384], vid.palette);
@ -166,6 +165,8 @@ VID_Init (unsigned char *palette)
VID_InitBuffers (); // allocate z buffer and surface cache VID_InitBuffers (); // allocate z buffer and surface cache
Con_CheckResize (); // Now that we have a window size, fix console
SDL_ShowCursor (0); // initialize the mouse SDL_ShowCursor (0); // initialize the mouse
#ifdef _WIN32 #ifdef _WIN32