qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-22 11:51:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prep of menus for video modularization.

Browse source
This commit is contained in:
Dan Olson 2000-02-15 14:25:03 +00:00
parent b099c73cc4
commit c878ab64f4
6 changed files with 13 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/gl_vidnt.c
View file

@ -1863,15 +1863,11 @@ VID_MenuDraw
*/ */
void VID_MenuDraw (void) void VID_MenuDraw (void)
{ {
qpic_t *p;
char *ptr; char *ptr;
int lnummodes, i, j, k, column, row, dup, dupmode; int lnummodes, i, j, k, column, row, dup, dupmode;
char temp[100]; char temp[100];
vmode_t *pv; vmode_t *pv;
p = Draw_CachePic ("gfx/vidmodes.lmp");
M_DrawPic ( (320-p->width)/2, 4, p);
vid_wmodes = 0; vid_wmodes = 0;
lnummodes = VID_NumModes (); lnummodes = VID_NumModes ();

4
common/vid_dos.c
View file

@ -577,7 +577,6 @@ VID_MenuDraw
*/ */
void VID_MenuDraw (void) void VID_MenuDraw (void)
{ {
qpic_t *p;
char *ptr; char *ptr;
int nummodes, i, j, column, row, dup; int nummodes, i, j, column, row, dup;
char temp[100]; char temp[100];
@ -585,9 +584,6 @@ void VID_MenuDraw (void)
vid_wmodes = 0; vid_wmodes = 0;
nummodes = VID_NumModes (); nummodes = VID_NumModes ();
p = Draw_CachePic ("gfx/vidmodes.lmp");
M_DrawPic ( (320-p->width)/2, 4, p);
for (i=0 ; i<nummodes ; i++) for (i=0 ; i<nummodes ; i++)
{ {
if (vid_wmodes < MAX_MODEDESCS) if (vid_wmodes < MAX_MODEDESCS)

18
common/vid_sunxil.c
View file

@ -307,21 +307,6 @@ static Cursor CreateNullCursor(Display *display, Window root)
} }
void VID_MenuDraw( void )
{
qpic_t *p;
char *ptr;
int i, j, column, row, dup;
char temp[100];
p = Draw_CachePic ("gfx/vidmodes.lmp");
M_DrawPic ( (320-p->width)/2, 4, p);
M_Print (4*8, 36 + MAX_COLUMN_SIZE * 8 + 8, "Video mode switching unavailable");
M_Print (9*8, 36 + MAX_COLUMN_SIZE * 8 + 8*6, "Press any key...");
}
void VID_MenuKey( int key ) { M_Menu_Options_f (); }
// Called at startup to set up translation tables, takes 256 8 bit RGB values // Called at startup to set up translation tables, takes 256 8 bit RGB values
// the palette data will go away after the call, so it must be copied off if // the palette data will go away after the call, so it must be copied off if
// the video driver will need it again // the video driver will need it again
@ -628,9 +613,6 @@ void VID_Init (unsigned char *palette)
VID_ResetFramebuffer(); VID_ResetFramebuffer();
D_InitCaches (surfcache, sizeof(surfcache)); D_InitCaches (surfcache, sizeof(surfcache));
vid_menudrawfn = VID_MenuDraw;
vid_menukeyfn = VID_MenuKey;
} }
VID_ResetFramebuffer() VID_ResetFramebuffer()

4
common/vid_win.c
View file

@ -3119,16 +3119,12 @@ VID_MenuDraw
*/ */
void VID_MenuDraw (void) void VID_MenuDraw (void)
{ {
qpic_t *p;
char *ptr; char *ptr;
int lnummodes, i, j, k, column, row, dup; int lnummodes, i, j, k, column, row, dup;
char temp[100]; char temp[100];
vmode_t *pv; vmode_t *pv;
modedesc_t tmodedesc; modedesc_t tmodedesc;
p = Draw_CachePic ("gfx/vidmodes.lmp");
M_DrawPic ( (320-p->width)/2, 4, p);
for (i=0 ; i<3 ; i++) for (i=0 ; i<3 ; i++)
{ {
ptr = VID_GetModeDescriptionMemCheck (i); ptr = VID_GetModeDescriptionMemCheck (i);

8
qw_client/menu.c
View file

@ -851,10 +851,6 @@ void M_Keys_Key (int k)
static void static void
vid_menudraw(void) vid_menudraw(void)
{ {
qpic_t *p;
p = Draw_CachePic("gfx/vidmodes.lmp");
M_DrawPic ((320-p->width)/2, 4, p);
M_Print(4*8, 36 + MAX_COLUMN_SIZE * 8 + 8, M_Print(4*8, 36 + MAX_COLUMN_SIZE * 8 + 8,
"Video mode switching unavailable"); "Video mode switching unavailable");
M_Print(9*8, 36 + MAX_COLUMN_SIZE * 8 + 8*6, "Press any key..."); M_Print(9*8, 36 + MAX_COLUMN_SIZE * 8 + 8*6, "Press any key...");
@ -882,6 +878,10 @@ void M_Menu_Video_f (void)
void M_Video_Draw(void) void M_Video_Draw(void)
{ {
qpic_t *p;
p = Draw_CachePic("gfx/vidmodes.lmp");
M_DrawPic((320-p->width)/2, 4, p);
if (vid_menudrawfn == NULL) { if (vid_menudrawfn == NULL) {
Sys_Error("M_Video_Draw called when vid_menudrawfn == NULL!\n"); Sys_Error("M_Video_Draw called when vid_menudrawfn == NULL!\n");
} }

12
uquake/menu.c
View file

@ -1554,10 +1554,11 @@ void M_Keys_Key (int k)
static void static void
vid_menudraw(void) vid_menudraw(void)
{ {
qpic_t *p; // DDOI - Moved title pic to M_Video_Draw()
// qpic_t *p;
p = Draw_CachePic("gfx/vidmodes.lmp"); // p = Draw_CachePic("gfx/vidmodes.lmp");
M_DrawPic ((320-p->width)/2, 4, p); // M_DrawPic ((320-p->width)/2, 4, p);
M_Print(4*8, 36 + MAX_COLUMN_SIZE * 8 + 8, M_Print(4*8, 36 + MAX_COLUMN_SIZE * 8 + 8,
"Video mode switching unavailable"); "Video mode switching unavailable");
M_Print(9*8, 36 + MAX_COLUMN_SIZE * 8 + 8*6, "Press any key..."); M_Print(9*8, 36 + MAX_COLUMN_SIZE * 8 + 8*6, "Press any key...");
@ -1585,6 +1586,11 @@ void M_Menu_Video_f (void)
void M_Video_Draw(void) void M_Video_Draw(void)
{ {
qpic_t *p;
p = Draw_CachePic("gfx/vidmodes.lmp");
M_DrawPic((320-p->width)/2,4, p);
if (vid_menudrawfn == NULL) { if (vid_menudrawfn == NULL) {
Sys_Error("M_Video_Draw called when vid_menudrawfn == NULL!\n"); Sys_Error("M_Video_Draw called when vid_menudrawfn == NULL!\n");
} }