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

More menu stuff and input plugin loading for -glx targets

Browse source
This commit is contained in:
Dan Olson 2000-02-15 18:45:26 +00:00
parent c878ab64f4
commit b03c0a094e
6 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/gl_vidglx.c
View file

@ -41,6 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdlib.h>
#include <ctype.h>
#include <signal.h>
#include <plugin.h>
#ifdef HAVE_DLFCN_H
# include <dlfcn.h>
@ -574,6 +575,9 @@ void VID_Init(unsigned char *palette)
Window root;
XVisualInfo *visinfo;
plugin_load("./in_x11.so");
IN->Init();
S_Init();
Cvar_RegisterVariable(&vid_mode);

4
common/gl_vidnt.c
View file

@ -1863,11 +1863,15 @@ 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_Draw((320-p->width)/2,4,p);
vid_wmodes = 0;
lnummodes = VID_NumModes ();

4
common/vid_dos.c
View file

@ -577,10 +577,14 @@ VID_MenuDraw
*/
void VID_MenuDraw (void)
{
qpic_t *p;
char *ptr;
int nummodes, i, j, column, row, dup;
char temp[100];
p = Draw_CachePic("gfx/vidmodes.lmp");
M_Draw((320-p->width)/2,4,p);
vid_wmodes = 0;
nummodes = VID_NumModes ();

4
common/vid_win.c
View file

@ -3119,12 +3119,16 @@ 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_Draw((320-p->width)/2,4,p);
for (i=0 ; i<3 ; i++)
{
ptr = VID_GetModeDescriptionMemCheck (i);

9
qw_client/menu.c
View file

@ -851,6 +851,11 @@ 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...");
@ -878,10 +883,6 @@ 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");
}

12
uquake/menu.c
View file

@ -1554,11 +1554,10 @@ void M_Keys_Key (int k)
static void
vid_menudraw(void)
{
// DDOI - Moved title pic to M_Video_Draw()
// qpic_t *p;
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...");
@ -1586,11 +1585,6 @@ 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");
}