From 769b0bc53ced2608ced0f5edd8e3eefe545dc7ed Mon Sep 17 00:00:00 2001 From: Joseph Carter Date: Sat, 18 Mar 2000 08:16:47 +0000 Subject: [PATCH] new cvar: cl_verstring, set it to "" if you want to get rid of that. Here you go ambush.. --- AUTHORS | 301 +++++++++++++++++++++++++---------------------- common/cl_main.c | 10 +- common/client.h | 1 + common/draw.c | 11 +- common/gl_draw.c | 9 +- 5 files changed, 177 insertions(+), 155 deletions(-) diff --git a/AUTHORS b/AUTHORS index 1f4c926..d07bf88 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,52 +1,43 @@ -N: Nelson Rush -E: palisade@quakeforge.net -D: QuakeForge Project Maintainer -D: Website Design -D: QW/Q1 tree merging -D: Math fixes/optimizations -D: Buffer overflow fixes -D: Documentation +QuakeForge Authors +------------------ -N: Chase Hargraves -E: absolutek@quakeforge.net -D: Irc logging -D: Website design +This file should contain a listing of every single person who has worked +on or submitted code to the QuakeForge project. Unfortunately, we must +admit that this listing is probably far from complete. It is probably not +possible to list every single person who has had a positive impact on the +development of QuakeForge, but we're going to try anyway. -N: Jeff Teunissen -E: d2deek@pmail.net -D: QW/Q1 tree merging -D: IRC Info bot -D: Website design +Every contribution is important, even the ones that don't seem like it at +the time. If you've made a contribution to QuakeForge and aren't listed +here, you should be! Please accept our apologies and let us know right +away and we'll see to it that you get the credit you deserve. -N: Zephaniah E. Hull -E: warp@whitestar.soark.net -D: QW/Q1 tree merging -D: GL renderer fixes/optimizations -D: Input handling fixes/optimizations -D: Cheat/exploit fixes +N: Aaron Alcock (SaRcaZm) +E: epca@powerup.com.au +D: RGBA colored lightmaps (static/dynamic) -N: Marcus Sundberg -E: mackan@stacken.kth.se +N: Andrew Alexander (Slade) +E: slade@quakelives.com +D: Reworking of the heart beat, and ping taking code on the server side. +D: sv_maxrate support.. + +N: Peter Andreasen +E: pandr@pandr.dk D: QW/Q1 tree merging D: Autoconf support and portability -D: Sound cleanups -D: Input handling fixes/optimizations -D: GGI support -D: mingw32 Win32 support -D: CD-ROM support/optimizations -D: DGA/XMESA support. -D: On-the-fly resizing of window in *-gl versions. -N: Bill Currie -E: bill@taniwha.org -D: QW/Q1 tree merging +N: Cesar Eduardo Barros +E: cesarb@web4u.com.br D: Autoconf support and portability -D: ALSA sound support -N: Eric Windisch -E: windisch@nni.com +N: Jules Bean +E: jules@debian.org +D: show_fps merge into UQuake + +N: Maas van den Berg +E: email@dds.nl D: QW/Q1 tree merging -D: GL renderer fixes/optimizations +D: SDL support N: Joseph Carter (Knghtbrd) E: knghtbrd@debian.org @@ -62,15 +53,41 @@ D: Skybox implementation (several mods to existing tutorial) D: Made RGBA lightmaps actually work D: Statusbar fixes -N: Peter Andreasen -E: pandr@pandr.dk +N: Andrew Coles +E: andycole123@ic24.net +D: CD-ROM support/fixes + +N: Bill Currie +E: bill@taniwha.org D: QW/Q1 tree merging D: Autoconf support and portability +D: ALSA sound support -N: Maas van den Berg -E: email@dds.nl -D: QW/Q1 tree merging -D: SDL support +N: Sam Dennis +E: sdennis101@geocities.com +D: UQuake patch for segfault in net_udp.c + +N: Mads Bondo Dydensborg +E: madsdyd@challenge.dk +D: Cheat/exploit fixes + +N: Robert S. Elsner +E: sockman@ngfc.com +D: Sound cleanups + +N: Anton Gavrilov +E: tonik@quake.ru +D: VC Win32 support +D: Console editing + +N: Ryan C. Gordon +E: ryan_gorden@hotmail.com +D: Sound cleanups + +N: Chase Hargraves +E: absolutek@quakeforge.net +D: Irc logging +D: Website design N: Loring Holden E: lsh@cv.brown.edu @@ -78,9 +95,46 @@ D: Autoconf support and portability D: CD-ROM support/optimizations D: AIX/IRIX/Sun Support -N: Cesar Eduardo Barros -E: cesarb@web4u.com.br -D: Autoconf support and portability +N: Zephaniah E. Hull +E: warp@whitestar.soark.net +D: QW/Q1 tree merging +D: GL renderer fixes/optimizations +D: Input handling fixes/optimizations +D: Cheat/exploit fixes + +N: Theo van Klaveren +E: havoc@phoenix.student.utwente.nl +D: CD-ROM support/optimizations + +N: Sam Lantinga +E: slouken@devolution.com +D: SDL support + +N: Pontus Lidman +E: +D: adding IPv6 support + +N: Nye Liu (nyet) +E: nyet@nbase.com +D: game dir fixes + +N: Justin A. McCright +E: jam@qIj.damogran.org +D: Svgalib fixes/optimizations + +N: Roger Sen Montero +E: rogersm@tau.uab.es +D: Cheat/exploit fixes +D: Network code fixes/cleanups + +N: Dan Nelson +E: dnelson@emsphone.com +D: Typo fix +D: Help with the speed cheat fix + +N: Jason Nelson +E: jason_nelson@email.msn.com +D: VC win32 support. N: Daniel J. O'Connor E: darius@dons.net.au @@ -88,18 +142,14 @@ D: Autoconf support and portability D: Corrected failed mmap checking D: FreeBSD support -N: Tim Rowley -E: tor@cs.brown.edu -D: Autoconf support and portability -D: AIX/IRIX/Sun support +N: Dan Olson +E: theoddone@quakefiles.com +D: Misc. code fixes +D: Driver modules -N: Ryan C. Gordon -E: ryan_gorden@hotmail.com -D: Sound cleanups - -N: Robert S. Elsner -E: sockman@ngfc.com -D: Sound cleanups +N: Tane Piper +E: descent@barrysworld.com +D: GL skybox tutorial N: Michael Pujos E: mpujos@mail.dotcom.fr @@ -109,102 +159,71 @@ N: Filip Van Raemdonck E: filipvr@xs4all.be D: Input handling fixes/optimizations -N: Zinx Verituse -E: zinx@linuxfreak.com +N: Tim Rowley +E: tor@cs.brown.edu +D: Autoconf support and portability +D: AIX/IRIX/Sun support + +N: Nelson Rush (Palisade) +E: palisade@quakeforge.net +D: Project Administration +D: Website Design +D: QW/Q1 tree merging D: Math fixes/optimizations - -N: Justin A. McCright -E: jam@qIj.damogran.org -D: Svgalib fixes/optimizations - -N: Sam Lantinga -E: slouken@devolution.com -D: SDL support - -N: Neal White III -E: nwhite@softblox.com -D: GL fullbright support (removed temporarily) - -N: Dan Nelson -E: dnelson@emsphone.com -D: Typo fix -D: Help with the speed cheat fix - -N: Dan Olson -E: theoddone@quakefiles.com -D: Misc. code fixes -D: Driver modules - -N: Mads Bondo Dydensborg -E: madsdyd@challenge.dk -D: Cheat/exploit fixes - -N: Roger Sen Montero -E: rogersm@tau.uab.es -D: Cheat/exploit fixes -D: Network code fixes/cleanups - -N: Theo van Klaveren -E: havoc@phoenix.student.utwente.nl -D: CD-ROM support/optimizations - -N: Ricardo Veguilla -E: r_veguilla_pr@yahoo.com -D: Fix for SDL _windowed_mouse - -N: Pontus Lidman -E: -D: adding IPv6 support - -N: David Symonds -E: xoxus@usa.net -D: svgalib fixes -D: warnings cleanup and XShm checking +D: Buffer overflow fixes +D: Documentation N: Tarjei Skorgenes E: tarjei.skorgenes@online.no D: Makefile fixes -N: Andrew Coles -E: andycole123@ic24.net -D: CD-ROM support/fixes - -N: Andrew Alexander (Slade) -E: slade@quakelives.com -D: Reworking of the heart beat, and ping taking code on the server side. -D: sv_maxrate support.. - -N: Nye "nyet" Liu -E: nyet@nbase.com -D: game dir fixes - -N: Jules Bean -E: jules@debian.org -D: show_fps merge into UQuake - -N: Jason Nelson -E: jason_nelson@email.msn.com -D: VC win32 support. - N: Jukka Sorjonen E: jukka.sorjonen@asikkala.fi D: Bug squasher (see below). D: QW network protocol fixes. D: Found out why our VERSION was messing things up.. -N: Tane Piper -E: descent@barrysworld.com -D: GL skybox tutorial +N: Marcus Sundberg +E: mackan@stacken.kth.se +D: QW/Q1 tree merging +D: Autoconf support and portability +D: Sound cleanups +D: Input handling fixes/optimizations +D: GGI support +D: mingw32 Win32 support +D: CD-ROM support/optimizations +D: DGA/XMESA support. +D: On-the-fly resizing of window in *-gl versions. -N: Nawfel Tricha +N: David Symonds +E: xoxus@usa.net +D: svgalib fixes +D: warnings cleanup and XShm checking + +N: Jeff Teunissen (Deek) +E: d2deek@pmail.net +D: QW/Q1 tree merging +D: IRC Info bot +D: Website design + +N: Nawfel Tricha (Topaz) E: topaz@endorproductions.com D: GL spinning console -N: Aaron Alcock (SaRcaZm) -E: epca@powerup.com.au -D: RGBA colored lightmaps (static/dynamic) +N: Ricardo Veguilla +E: r_veguilla_pr@yahoo.com +D: Fix for SDL _windowed_mouse + +N: Zinx Verituse +E: zinx@linuxfreak.com +D: Math fixes/optimizations + +N: Neal White III +E: nwhite@softblox.com +D: GL fullbright support (removed temporarily) + +N: Eric Windisch +E: windisch@nni.com +D: QW/Q1 tree merging +D: GL renderer fixes/optimizations -N: Anton Gavrilov -E: tonik@quake.ru -D: VC Win32 support -D: Console editing diff --git a/common/cl_main.c b/common/cl_main.c index 4786e0c..7d6aa44 100644 --- a/common/cl_main.c +++ b/common/cl_main.c @@ -119,6 +119,7 @@ cvar_t *entlatency; cvar_t *cl_predict_players; cvar_t *cl_predict_players2; cvar_t *cl_solid_players; +cvar_t *cl_verstring; extern cvar_t *sys_nostdout; @@ -454,7 +455,7 @@ void CL_ConnectionlessPacket (void) Con_Printf("===========================\n"); Con_Printf("Invalid localid on command packet received from local host. " "\n|%s| != |%s|\n" - "You may need to reload your server browser and QuakeWorld.\n", + "You may need to reload your server browser and QuakeForge.\n", s, localid->string); Con_Printf("===========================\n"); Cvar_Set("localid", ""); @@ -1713,6 +1714,13 @@ void CL_InitCvars() cl_hudswap = Cvar_Get ("cl_hudswap","1",CVAR_ARCHIVE,"None"); cl_maxfps = Cvar_Get ("cl_maxfps","0",CVAR_ARCHIVE,"None"); cl_timeout = Cvar_Get ("cl_timeout","60",0,"None"); + cl_verstring = Cvar_Get ("cl_verstring", +#ifdef QUAKEWORLD + "QuakeForge (QW client) " QF_VERSION, +#else + "QuakeForge (UQuake) " QF_VERSION, +#endif + CVAR_NONE, "Console version string"); lookspring = Cvar_Get ("lookspring","0",CVAR_ARCHIVE,"None"); lookstrafe = Cvar_Get ("lookstrafe","0",CVAR_ARCHIVE,"None"); sensitivity = Cvar_Get ("sensitivity","3",CVAR_ARCHIVE,"None"); diff --git a/common/client.h b/common/client.h index a50d929..d039fe2 100644 --- a/common/client.h +++ b/common/client.h @@ -373,6 +373,7 @@ extern cvar_t *cl_sbar; extern cvar_t *cl_hudswap; extern cvar_t *cl_pitchdriftspeed; +extern cvar_t *cl_verstring; extern cvar_t *lookspring; extern cvar_t *lookstrafe; extern cvar_t *sensitivity; diff --git a/common/draw.c b/common/draw.c index 22ed989..3fd5a87 100644 --- a/common/draw.c +++ b/common/draw.c @@ -635,15 +635,11 @@ void Draw_ConsoleBackground (int lines) int f, fstep; qpic_t *conback; static char saveback[320*8]; -#ifdef QUAKEWORLD - char ver[] = "QuakeForge (QW client) " QF_VERSION; -#else - char ver[] = "QuakeForge (UQuake) " QF_VERSION; -#endif conback = Draw_CachePic ("gfx/conback.lmp"); - dest = conback->data + 320 - (strlen(ver)*8 + 11) + 320*186; + dest = conback->data + 320 - (strlen(cl_verstring->string)*8 + 11) + + 320*186; memcpy(saveback, conback->data + 320*186, 320*8); @@ -704,7 +700,8 @@ void Draw_ConsoleBackground (int lines) // put it back memcpy(conback->data + 320*186, saveback, 320*8); - Draw_Alt_String (vid.conwidth - strlen(ver)*8 - 11, lines-14, ver); + Draw_Alt_String (vid.conwidth - strlen(cl_verstring->string)*8 - 11, + lines-14, cl_verstring->string); } diff --git a/common/gl_draw.c b/common/gl_draw.c index 36a4590..857eeac 100644 --- a/common/gl_draw.c +++ b/common/gl_draw.c @@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include +#include #include extern unsigned char d_15to8table[65536]; @@ -760,11 +761,6 @@ Draw_ConsoleBackground */ void Draw_ConsoleBackground (int lines) { -#ifdef QUAKEWORLD - char ver[] = "QuakeForge (QW client) " QF_VERSION; -#else - char ver[] = "QuakeForge (UQuake) " QF_VERSION; -#endif int y; qpic_t *conback; glpic_t *gl; @@ -836,7 +832,8 @@ void Draw_ConsoleBackground (int lines) glPopMatrix (); } - Draw_Alt_String (vid.conwidth - strlen(ver)*8 - 11, lines-14, ver); + Draw_Alt_String (vid.conwidth - strlen(cl_verstring->string)*8 - 11, + lines-14, cl_verstring->string); }