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

TODO items completed are removed

Browse source 
misc minor stuff taken from ideas implemented in NaTaS, most people won't
notice a real difference.
This commit is contained in:
Joseph Carter 2000-04-15 10:14:40 +00:00
parent ed5454ef6d
commit 3e73b3fb3c
4 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
TODO
View file

@ -33,7 +33,7 @@ PLEASE NOTE: Because the merge is still in progress, we haven't even
Major projects: Major projects:
* (0.2) Merge Quake/QuakeWorld [almost everybody] * (0.2) Merge Quake/QuakeWorld (essentially done)
+ (0.3?) Make one QF bin w/ many shared libs + (0.3?) Make one QF bin w/ many shared libs
+ Integration of Aftershock + Integration of Aftershock
? Redesign the entire network protocol to be more extensible and ? Redesign the entire network protocol to be more extensible and
@ -48,8 +48,8 @@ Platform support:
+ (0.2) Seperate pak game and config directory support + (0.2) Seperate pak game and config directory support
+ (0.2) Global config file [knghtbrd] + (0.2) Global config file [knghtbrd]
+ (0.2?) Automake support + (0.2?) Automake support
+ (0.3) Revamp the entire menu subsystem + (0.3?) Revamp the entire menu subsystem
+ Return of the unix dedicated server + Return of the unix dedicated uquake server
+ Add more platform support + Add more platform support
- Audio support for more platforms - Audio support for more platforms
- Support for XInput - Support for XInput
@ -61,7 +61,6 @@ Platform support:
Game engine: Game engine:
* (0.2) zip-packed game files (pak3 and similar) [raptor] * (0.2) zip-packed game files (pak3 and similar) [raptor]
+ (0.2) Enhanced console (history, cmdline editing)
* (0.3?) Add a volumetric fog engine [raptor] * (0.3?) Add a volumetric fog engine [raptor]
+ Allow server admin to adjust air control (ie. in low gravity) + Allow server admin to adjust air control (ie. in low gravity)
- Add a wind engine - Add a wind engine
@ -78,7 +77,6 @@ Game engine:
Other engines: Other engines:
+ (0.2?) Real mouse wheel support + (0.2?) Real mouse wheel support
+ (0.3?) Colored lighting support [raptor]
- (0.3?) Make the damned brightness slider in GL renderers useful - (0.3?) Make the damned brightness slider in GL renderers useful
+ More generalized sound/music APIs [mercury, knghtbrd] + More generalized sound/music APIs [mercury, knghtbrd]
- Support overriding the 8x8 console font with one of any size - Support overriding the 8x8 console font with one of any size

8
common/gl_draw.c
View file

@ -516,7 +516,8 @@ void Draw_String (int x, int y, char *str)
Draw_Alt_String Draw_Alt_String
================ ================
*/ */
void Draw_Alt_String (int x, int y, char *str) void
Draw_Alt_String (int x, int y, char *str)
{ {
while (*str) while (*str)
{ {
@ -526,7 +527,8 @@ void Draw_Alt_String (int x, int y, char *str)
} }
} }
void Draw_Crosshair(void) void
Draw_Crosshair(void)
{ {
int x, y; int x, y;
extern vrect_t scr_vrect; extern vrect_t scr_vrect;
@ -913,6 +915,7 @@ void Draw_FadeScreen (void)
{ {
glEnable (GL_BLEND); glEnable (GL_BLEND);
glDisable (GL_TEXTURE_2D); glDisable (GL_TEXTURE_2D);
glDisable (GL_ALPHA_TEST);
glColor4f (0, 0, 0, 0.8); glColor4f (0, 0, 0, 0.8);
glBegin (GL_QUADS); glBegin (GL_QUADS);
@ -923,6 +926,7 @@ void Draw_FadeScreen (void)
glEnd (); glEnd ();
glColor4f (1,1,1,1); glColor4f (1,1,1,1);
glEnable (GL_ALPHA_TEST);
glEnable (GL_TEXTURE_2D); glEnable (GL_TEXTURE_2D);
glDisable (GL_BLEND); glDisable (GL_BLEND);

8
common/gl_rlight.c
View file

@ -167,7 +167,11 @@ void R_RenderDlights (void)
return; return;
r_dlightframecount = r_framecount + 1; // because the count hasn't r_dlightframecount = r_framecount + 1; // because the count hasn't
// advanced yet for this frame
if (r_fog->value)
glDisable (GL_FOG);
// advanced yet for this frame
glDepthMask (0); glDepthMask (0);
glDisable (GL_TEXTURE_2D); glDisable (GL_TEXTURE_2D);
glShadeModel (GL_SMOOTH); glShadeModel (GL_SMOOTH);
@ -187,6 +191,8 @@ void R_RenderDlights (void)
glEnable (GL_TEXTURE_2D); glEnable (GL_TEXTURE_2D);
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glDepthMask (1); glDepthMask (1);
if (r_fog->value)
glEnable (GL_FOG);
} }

11
common/gl_rmain.c
View file

@ -826,13 +826,14 @@ R_SetFrustum ( void ) {
R_SetupFrame R_SetupFrame
*/ */
void void
R_SetupFrame ( void ) { R_SetupFrame ( void )
// don't allow cheats in multiplayer {
// don't allow cheats in multiplayer
#ifdef QUAKEWORLD #ifdef QUAKEWORLD
r_fullbright->value = 0; Cvar_Set (r_fullbright, "0");
r_lightmap->value = 0; Cvar_Set (r_lightmap, "0");
if (!atoi(Info_ValueForKey(cl.serverinfo, "watervis"))) if (!atoi(Info_ValueForKey(cl.serverinfo, "watervis")))
r_wateralpha->value = 1; Cvar_Set (r_wateralpha, "1");
#else #else
if (cl.maxclients > 1) if (cl.maxclients > 1)
Cvar_Set (r_fullbright, "0"); Cvar_Set (r_fullbright, "0");