mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-22 11:51:17 +00:00
Prep of menus for video modularization.
This commit is contained in:
parent
b099c73cc4
commit
c878ab64f4
6 changed files with 13 additions and 37 deletions
|
@ -1863,15 +1863,11 @@ VID_MenuDraw
|
|||
*/
|
||||
void VID_MenuDraw (void)
|
||||
{
|
||||
qpic_t *p;
|
||||
char *ptr;
|
||||
int lnummodes, i, j, k, column, row, dup, dupmode;
|
||||
char temp[100];
|
||||
vmode_t *pv;
|
||||
|
||||
p = Draw_CachePic ("gfx/vidmodes.lmp");
|
||||
M_DrawPic ( (320-p->width)/2, 4, p);
|
||||
|
||||
vid_wmodes = 0;
|
||||
lnummodes = VID_NumModes ();
|
||||
|
||||
|
|
|
@ -577,7 +577,6 @@ VID_MenuDraw
|
|||
*/
|
||||
void VID_MenuDraw (void)
|
||||
{
|
||||
qpic_t *p;
|
||||
char *ptr;
|
||||
int nummodes, i, j, column, row, dup;
|
||||
char temp[100];
|
||||
|
@ -585,9 +584,6 @@ void VID_MenuDraw (void)
|
|||
vid_wmodes = 0;
|
||||
nummodes = VID_NumModes ();
|
||||
|
||||
p = Draw_CachePic ("gfx/vidmodes.lmp");
|
||||
M_DrawPic ( (320-p->width)/2, 4, p);
|
||||
|
||||
for (i=0 ; i<nummodes ; i++)
|
||||
{
|
||||
if (vid_wmodes < MAX_MODEDESCS)
|
||||
|
|
|
@ -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
|
||||
// the palette data will go away after the call, so it must be copied off if
|
||||
// the video driver will need it again
|
||||
|
@ -628,9 +613,6 @@ void VID_Init (unsigned char *palette)
|
|||
VID_ResetFramebuffer();
|
||||
|
||||
D_InitCaches (surfcache, sizeof(surfcache));
|
||||
|
||||
vid_menudrawfn = VID_MenuDraw;
|
||||
vid_menukeyfn = VID_MenuKey;
|
||||
}
|
||||
|
||||
VID_ResetFramebuffer()
|
||||
|
|
|
@ -3119,16 +3119,12 @@ VID_MenuDraw
|
|||
*/
|
||||
void VID_MenuDraw (void)
|
||||
{
|
||||
qpic_t *p;
|
||||
char *ptr;
|
||||
int lnummodes, i, j, k, column, row, dup;
|
||||
char temp[100];
|
||||
vmode_t *pv;
|
||||
modedesc_t tmodedesc;
|
||||
|
||||
p = Draw_CachePic ("gfx/vidmodes.lmp");
|
||||
M_DrawPic ( (320-p->width)/2, 4, p);
|
||||
|
||||
for (i=0 ; i<3 ; i++)
|
||||
{
|
||||
ptr = VID_GetModeDescriptionMemCheck (i);
|
||||
|
|
|
@ -851,10 +851,6 @@ void M_Keys_Key (int k)
|
|||
static 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,
|
||||
"Video mode switching unavailable");
|
||||
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)
|
||||
{
|
||||
qpic_t *p;
|
||||
|
||||
p = Draw_CachePic("gfx/vidmodes.lmp");
|
||||
M_DrawPic((320-p->width)/2, 4, p);
|
||||
if (vid_menudrawfn == NULL) {
|
||||
Sys_Error("M_Video_Draw called when vid_menudrawfn == NULL!\n");
|
||||
}
|
||||
|
|
|
@ -1554,10 +1554,11 @@ void M_Keys_Key (int k)
|
|||
static void
|
||||
vid_menudraw(void)
|
||||
{
|
||||
qpic_t *p;
|
||||
// DDOI - Moved title pic to M_Video_Draw()
|
||||
// qpic_t *p;
|
||||
|
||||
p = Draw_CachePic("gfx/vidmodes.lmp");
|
||||
M_DrawPic ((320-p->width)/2, 4, 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,
|
||||
"Video mode switching unavailable");
|
||||
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)
|
||||
{
|
||||
qpic_t *p;
|
||||
|
||||
p = Draw_CachePic("gfx/vidmodes.lmp");
|
||||
M_DrawPic((320-p->width)/2,4, p);
|
||||
|
||||
if (vid_menudrawfn == NULL) {
|
||||
Sys_Error("M_Video_Draw called when vid_menudrawfn == NULL!\n");
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue