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

added loring's patch to fix non-linux platform problems

Browse source 
Solaris stuff:
* vid_sunx.c - Added missing S_Init() so sounds works
* vid_sunx.c - Don't XCloseDisplay() if x_disp is 0
* vid_sunx.c - ClientMessage references only apropos for QuakeWorld

Non-linux stuff:
* qw_client/Makefile.in - use QW_CL_SYS_SRC instead of SYS_SRC
This commit is contained in:
Nelson Rush 2000-01-06 04:33:34 +00:00
parent 670413dee7
commit 6e69591b3f
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/vid_sunx.c
View file

@ -217,7 +217,7 @@ PIXEL24 xlib_rgb24(int r,int g,int b)
void st2_fixup( XImage *framebuf, int x, int y, int width, int height)
{
int xi,yi;
int yi;
unsigned char *src;
PIXEL16 *dest;
register int count, n;
@ -253,7 +253,7 @@ void st2_fixup( XImage *framebuf, int x, int y, int width, int height)
void st3_fixup( XImage *framebuf, int x, int y, int width, int height)
{
int xi,yi;
int yi;
unsigned char *src;
PIXEL24 *dest;
register int count, n;
@ -491,9 +491,6 @@ void ResetSharedFrameBuffers(void)
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);
@ -572,6 +569,8 @@ void VID_Init (unsigned char *palette)
int num_visuals;
int template_mask;
S_Init(); // sound is initialized here
Cmd_AddCommand ("gamma", VID_Gamma_f);
for (i=0 ; i<256 ; i++)
vid_gamma[i] = i;
@ -847,7 +846,7 @@ void VID_Shutdown (void)
XUngrabPointer(x_disp, CurrentTime);
XUndefineCursor(x_disp, x_win);
}
XCloseDisplay(x_disp);
if (x_disp) XCloseDisplay(x_disp);
}
int XLateKey(XKeyEvent *ev)
@ -973,9 +972,12 @@ void GetEvent(void)
case Expose:
sb_updates = 0;
break;
// Host_Quit_f only available in uquake
#ifndef QUAKEWORLD
case ClientMessage:
if (x_event.xclient.data.l[0] == aWMDelete) Host_Quit_f();
break;
#endif
case EnterNotify:
mouse_in_window = true;
break;

2
qw_client/Makefile.in
View file

@ -144,7 +144,7 @@ endif
SND_SRC += snd_mem.c snd_mix.c $(XTRA_SND_SRC)
SYS_SRC = @SYS_SRC@
SYS_SRC = @QW_CL_SYS_SRC@
# Networking source files
# FIXME: Should not assume UNIX