From 1cfc49b5b22d63170f83c9cac73eae41da0e6169 Mon Sep 17 00:00:00 2001 From: Joseph Carter Date: Tue, 1 Aug 2000 21:55:26 +0000 Subject: [PATCH] Clean up the warnings Tonik didn't --- ROADMAP | 18 +++++++++--------- configure.in | 16 ++++++++-------- source/cl_tent.c | 1 + source/cl_trans.c | 1 + source/cmd.c | 1 - source/vid_sgl.c | 2 +- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/ROADMAP b/ROADMAP index 07df26c..32d1d5c 100644 --- a/ROADMAP +++ b/ROADMAP @@ -3,23 +3,23 @@ X = done ? = maybe but not likely M = more testing -o it seems possible to crash a QF server still - need to fix this! X water textures are seriously screwed in GL -M GL is still way too slow +X Endy's effects need to be made to work properly (totally broken!) X R_DrawParticles in software hangs +M it seems possible to crash a QF server still - need to fix this! +M GL is still way too slow +M Scitech MGL used in win32 is screwed - dump it and use SDL o Draw_Pic and friends need a cleanup in GL at least o It's possible to stick on some obtuse-angled corners qwsv 2.3x didn't -o Scitech MGL used in win32 is screwed - dump it and use SDL o software PCXs don't work in X11 at least if you're using 24/32 color o console commands to see a user, ignore talk from them, etc -o more direct inter-team comms (ie, talk to offense or defense directly) -o improved crosshairs (custom file, 32 bit for GL, etc) -o Endy's effects need to be made to work properly (totally broken!) +o timestamping server (and optionally client) consoles +o fullbrights on models (yeah, we have to..) +? more direct inter-team comms (ie, talk to offense or defense directly) +? improved crosshairs (custom file, 32 bit for GL, etc) ? software targets should mix color at 16/16 or 24/32 color ? Draw_Pic and other tex draw functions should to use local palettes ? wad loader should load wad3 and fall back to wad2 if necessary -o timestamping server (and optionally client) consoles -o better control over client console logging +? better control over client console logging ? ban reasons and expire times -o fullbrights on models (yeah, we have to..) diff --git a/configure.in b/configure.in index b5ee38b..f346ff0 100644 --- a/configure.in +++ b/configure.in @@ -940,14 +940,14 @@ if test "x$HAVE_GGI" = xyes ; then TARGETS="$TARGETS qf-client-ggi\$(EXEEXT)" CL_TARGETS="$CL_TARGETS GGI" fi -#if test "x$HAVE_SDL" = xyes ; then -# TARGETS="$TARGETS qf-client-sdl\$(EXEEXT)" -# CL_TARGETS="$CL_TARGETS SDL" -# if test "x$HAVE_GLX" = xyes; then -# TARGETS="$TARGETS qf-client-sgl\$(EXEEXT)" -# CL_TARGETS="$CL_TARGETS SDL-GL" -# fi -#fi +if test "x$HAVE_SDL" = xyes ; then + TARGETS="$TARGETS qf-client-sdl\$(EXEEXT)" + CL_TARGETS="$CL_TARGETS SDL" + if test "x$HAVE_GLX" = xyes; then + TARGETS="$TARGETS qf-client-sgl\$(EXEEXT)" + CL_TARGETS="$CL_TARGETS SGL" + fi +fi if test "x$HAVE_SVGA" = xyes ; then TARGETS="$TARGETS qf-client-svga\$(EXEEXT)" CL_TARGETS="$CL_TARGETS SVGAlib" diff --git a/source/cl_tent.c b/source/cl_tent.c index 1065b11..82fa553 100644 --- a/source/cl_tent.c +++ b/source/cl_tent.c @@ -29,6 +29,7 @@ #ifdef HAVE_CONFIG_H # include #endif +#include "quakedef.h" // Host_EndGame #include "sys.h" #include "ctype.h" #include "render.h" diff --git a/source/cl_trans.c b/source/cl_trans.c index 79f1cfa..68297f8 100644 --- a/source/cl_trans.c +++ b/source/cl_trans.c @@ -29,6 +29,7 @@ #ifdef HAVE_CONFIG_H # include #endif +#include "quakedef.h" // Host_EndGame #include "sys.h" #include "vid.h" #include "client.h" diff --git a/source/cmd.c b/source/cmd.c index 2d7f9e2..ff4f12d 100644 --- a/source/cmd.c +++ b/source/cmd.c @@ -585,7 +585,6 @@ void Cmd_TokenizeString (char *text) { static char argv_buf[1024]; int argv_idx; - int i; argv_idx = 0; diff --git a/source/vid_sgl.c b/source/vid_sgl.c index 126489e..d93a980 100644 --- a/source/vid_sgl.c +++ b/source/vid_sgl.c @@ -613,8 +613,8 @@ void IN_Init (void) mouse_x = mouse_y = 0.0; mouse_avail = 1; - SDL_WM_GrabInput (SDL_GRAB_ON); SDL_ShowCursor (0); + SDL_WM_GrabInput (SDL_GRAB_ON); // FIXME: disable DGA if in_dgamouse says to }