- More r_dynamiclight options:

  r_dynamiclight 2 = Slightly additive dynamic light projections, modeled after the PS2 port
  r_dynamiclight 3 = disables dynamic light projections but substitutes them with flashblends (ala GLQuake). If r_monolightmaps are enabled, the flashblends are orange. Viewblends are left out as the sudden duration of the dynamic lights when firing would be harmful.
- Because of these changes, Riva 128 and Permedia 2 owners should be allowed to enjoy dynamic lights
- option to use ReactOS's wspiapi.h header (file not included)
- some makefile changes to allow an option for more Win 4 (95/NT4) compatiblity easier. Compiling with WINFOUR disables curl, uses SDL1, and has some additional workarounds to get it working on Windows 95 (winsock2 still required though)

Author: leilei-

Makefile

@@ -228,6 +228,14 @@ ifndef USE_LOCAL_HEADERS
 USE_LOCAL_HEADERS=1
 endif
 
+ifndef WINFOUR
+WINFOUR=0
+endif
+
+ifndef USE_REACTOS_WINSOCK_HEADER
+USE_REACTOS_WINSOCK_HEADER=0
+endif
+
 ifndef USE_RENDERER_DLOPEN
 USE_RENDERER_DLOPEN=1
 endif
@@ -244,6 +252,15 @@ ifndef SDL_VERSION
 SDL_VERSION=2
 endif
 
+ifeq ($(WINFOUR),1)
+  BASE_CFLAGS += -DWINFOUR
+  BASE_CFLAGS += -DUSE_REACTOS_WINSOCK_HEADER
+  BASE_CFLAGS += -DUSE_INTERNAL_JPEG
+  SDL_VERSION=1
+  USE_CURL=0
+  CLIENTBIN=oa95
+endif
+
 #############################################################################
 
 BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
@@ -1141,6 +1158,10 @@ ifeq ($(USE_LOCAL_HEADERS),1)
   BASE_CFLAGS += -DUSE_LOCAL_HEADERS
 endif
 
+ifeq ($(USE_REACTOS_WINSOCK_HEADER),1)
+  BASE_CFLAGS += -DUSE_REACTOS_WINSOCK_HEADER
+endif
+
 ifeq ($(BUILD_STANDALONE),1)
   BASE_CFLAGS += -DSTANDALONE
 endif
@@ -3020,8 +3041,8 @@ else
 	@$(MAKE) VERSION=$(VERSION) -C $(LOKISETUPDIR) V=$(V)
 endif
 
-dist:
-	git archive --format zip --output $(CLIENTBIN)-$(VERSION).zip HEAD
+# dist:
+#	git archive --format zip --output $(CLIENTBIN)-$(VERSION).zip HEAD
 
 #############################################################################
 # DEPENDENCIES

Makefile.OpenArena

@@ -10,11 +10,13 @@ BUILD_CLIENT=1
 BUILD_SERVER=1
 BUILD_GAME_SO=0
 BUILD_GAME_QVM=0
+USE_GIT=0
 BUILD_BASEGAME=0
 BUILD_MISSIONPACK=0
 BASEGAME=baseoa
 # VERSION=1.36+0.8.8
-VERSION=3.0.0a
+VERSION=TEST
+
 
 # OpenArena doesn't use opus yet
 USE_CODEC_VORBIS=1
@@ -24,13 +26,17 @@ ifndef USE_CODEC_XMP
 USE_CODEC_XMP=1
 endif
 
+USE_CURL=1
+
 # FLTO Test
 
 OPTIMIZE += -flto
 
-# This doesn't work with OpenArena yet
+# Not supported
 BUILD_RENDERER_OPENGL2=0
 # You can disable the renderer libraries and build in the OA renderer by default
+# This is disabled because we have some client builtins used (trace etc) and 
+# we are scaling back some modularization for security and support reasons.
 USE_RENDERER_DLOPEN=0
 
 # Choose version 1 or 2
@@ -58,6 +64,12 @@ CLIENTBIN=openarena
 SERVERBIN=oa_ded
 COPYDIR=/usr/local/games/openarena
 
+# Use the Winsock2 headers from ReactOS, which doesn't give errors in Win9x
+# USE_REACTOS_WINSOCK_HEADER=1
+
+# Enable changes to allow Windows 95 and NT4 to work 
+# (Overrides enabling libraries above that don't work well, and outputs to oa95.exe)
+WINFOUR=0
 
 # DEBUG_CFLAGS=-ggdb -O0
 

code/qcommon/net_ip.c

@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #	include <winsock2.h>
 #	include <ws2tcpip.h>
 #	if WINVER < 0x501
+
 #		ifdef __MINGW32__
 			// wspiapi.h isn't available on MinGW, so if it's
 			// present it's because the end user has added it
@@ -37,6 +38,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #		endif
 #	else
 #		include <ws2spi.h>
+#	endif
+
+			// leilei - addition to fix win9x
+#	ifdef USE_REACTOS_WINSOCK_HEADER
+#		include "../reactos/wspiapi.h"
 #	endif
 
 typedef int socklen_t;

code/reactos/readme.md

@@ -0,0 +1,2 @@
+Place ReactOS' wspiapi.h file here.
+

code/renderer_oa/tr_backend.c

@@ -849,6 +849,95 @@ void RB_BeginDrawingView (void) {
 
 #define	MAC_EVENT_PUMP_MSEC		5
 
+
+/*
+===================
+R_RenderFlashblend
+
+leilei - GLQuake RenderDlights
+Renders the classic GLQuake flashblend cone to subsitute dynamic lights. May be
+a little redundant with r_flaresDlight
+===================
+*/
+static void R_RenderFlashblend (dlight_t *light)
+{
+	int		i, j;
+	float	a;
+	vec3_t	v, vv;
+	float	rad;
+	vec3_t vup, vpn, vright;
+	vec3_t point;
+	float ofs = 1;
+
+	if ( (backEnd.refdef.rdflags & RDF_NOWORLDMODEL)) 	return;		// leilei - don't draw flashblends in the UI
+
+	VectorCopy( backEnd.refdef.viewaxis[0], vpn );
+	VectorCopy( backEnd.refdef.viewaxis[1], vright );
+	VectorCopy( backEnd.refdef.viewaxis[2], vup );
+
+
+	rad = light->radius * 0.35f;
+
+	for (int qj=0 ; qj<3 ; qj++)
+		v[qj] = light->origin[qj];
+
+	VectorSubtract (light->origin, backEnd.or.viewOrigin, vv);
+
+	RB_BeginSurface( tr.coneShader, tess.fogNum );
+
+	for (i=0 ; i<3 ; i++)
+		tess.xyz[tess.numVertexes][i] = light->origin[i] - (vpn[i]*(rad*(ofs*.75)));
+	tess.vertexColors[tess.numVertexes][0] = light->color[0] * 64;
+	tess.vertexColors[tess.numVertexes][1] = light->color[1] * 64;
+	tess.vertexColors[tess.numVertexes][2] = light->color[2] * 64;
+
+	// glquake's colors kick in if monolightmaps
+	if (r_monolightmaps->integer){
+	tess.vertexColors[tess.numVertexes][0] = 0.3 * 255;
+	tess.vertexColors[tess.numVertexes][1] = 0.2 * 255;
+	tess.vertexColors[tess.numVertexes][2] = 0.0 * 255;
+	}
+	tess.vertexColors[tess.numVertexes][3] = 255;
+	tess.numVertexes++;
+
+	for (int qi=0 ; qi<(17) ; qi++)
+	{
+		a = qi/(float)(16) * M_PI*2;
+		for (int qj=0 ; qj<3 ; qj++)
+		point[qj] = v[qj] + vright[qj]*cos(a)*rad + vup[qj]*sin(a)*rad;
+		VectorCopy (point, tess.xyz[tess.numVertexes] );
+		tess.vertexColors[tess.numVertexes][0] = 0;
+		tess.vertexColors[tess.numVertexes][1] = 0;
+		tess.vertexColors[tess.numVertexes][2] = 0;
+		tess.vertexColors[tess.numVertexes][3] = 0;
+		tess.indexes[tess.numIndexes++] = 0;
+		tess.indexes[tess.numIndexes++] = qi;
+		tess.indexes[tess.numIndexes++] = qi+1;
+		tess.numVertexes++;
+	}
+	RB_EndSurface();
+
+}
+
+
+// leilei - go through the active dlights, and then draw them
+static void RB_RenderFlashblends() {
+	int l;
+	int i;
+	if ( !backEnd.refdef.num_dlights ) {
+		return;
+	}
+	l = backEnd.refdef.dlights;
+	
+	for (i=0 ; i<backEnd.refdef.num_dlights ; i++, l++) {
+		dlight_t	*dl = &backEnd.refdef.dlights[i];
+		
+		if (dl->additive == 2)
+			R_RenderFlashblend(dl); // this is definitely flashblend.
+	}
+
+};
+
 /*
 ==================
 RB_RenderDrawSurfList
@@ -1038,6 +1127,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	// add the particles
 	//R_AddParticles ();
 	R_RenderParticles ();
+	RB_RenderFlashblends();		
 
 	// add light flares on lights that aren't obscured
 	RB_RenderFlares();

code/renderer_oa/tr_local.h

@@ -1153,6 +1153,8 @@ typedef struct {
 	shader_t				*flareShaderAtlas;	// leilei - lens reflections
 	shader_t				*sunShader;
 
+	shader_t				*coneShader;		// leilei - flashblends
+
 	qhandle_t				skipProgram;
 	qhandle_t				defaultProgram;
 	qhandle_t				vertexLitProgram;

code/renderer_oa/tr_scene.c

@@ -241,10 +241,6 @@ void RE_AddDynamicLightToScene( const vec3_t org, float intensity, float r, floa
 	if ( intensity <= 0 ) {
 		return;
 	}
-	// these cards don't have the correct blend mode
-	if ( glConfig.hardwareType == GLHW_RIVA128 || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
-		return;
-	}
 
 	dl = &backEndData->dlights[r_numdlights++];
 
@@ -266,6 +262,26 @@ void RE_AddDynamicLightToScene( const vec3_t org, float intensity, float r, floa
 	dl->color[1] = g;
 	dl->color[2] = b;
 	dl->additive = additive;
+
+	// leilei - q3r/alice mode
+	if ( r_dynamiclight->integer == 2){
+
+		dl->color[0] = r * 0.1;
+		dl->color[1] = g * 0.1;
+		dl->color[2] = b * 0.1;
+		dl->additive = 1;
+	}
+
+	// these cards don't have the correct blend mode
+	// leilei - so force additive and keep going
+	if ( glConfig.hardwareType == GLHW_RIVA128 || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
+		dl->additive = 1;
+	}
+
+	// leilei - glquake mode - 2 shuts off the light projection to make room for flashblend
+	if ( r_dynamiclight->integer == 3)
+		dl->additive = 2;
+
 }
 
 /*
@@ -374,9 +390,10 @@ void RE_RenderScene( const refdef_t *fd ) {
 
 	// turn off dynamic lighting globally by clearing all the
 	// dlights if it needs to be disabled or if vertex lighting is enabled
-	if ( r_dynamiclight->integer == 0 ||
+	if ( r_dynamiclight->integer == 0 // ||
 		 // r_vertexLight->integer == 1 || // leilei - commented this out, as we can now do dynamic lights with vertex light
-		 glConfig.hardwareType == GLHW_PERMEDIA2 ) {
+		 // glConfig.hardwareType == GLHW_PERMEDIA2 // leilei - commented this out, as permedia should play with flashblend/verts
+		) {
 		tr.refdef.num_dlights = 0;
 	}
 

code/renderer_oa/tr_shade.c

@@ -644,6 +644,12 @@ static void ProjectDlightTexture_scalar( void ) {
 		colors = colorArray[0];
 
 		dl = &backEnd.refdef.dlights[l];
+
+		if ( dl->additive == 2) // leilei - glquake flashblend mode
+		{
+			return;
+		}
+
 		VectorCopy( dl->transformed, origin );
 		radius = dl->radius;
 		scale = 1.0f / radius;

code/renderer_oa/tr_shader.c

@@ -5521,6 +5521,15 @@ static void CreateInternalShaders( void ) {
 	Q_strncpyz( shader.name, "<stencil shadow>", sizeof( shader.name ) );
 	shader.sort = SS_STENCIL_SHADOW;
 	tr.shadowShader = FinishShader();
+
+	// leilei - cone shader for flashblend
+	Q_strncpyz( shader.name, "<cone add>", sizeof( shader.name ) );
+	stages[0].bundle[0].image[0] = tr.whiteImage;
+	stages[0].active = qtrue;
+	stages[0].rgbGen = CGEN_VERTEX;
+	stages[0].alphaGen = AGEN_VERTEX;
+ 	stages[0].stateBits = GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE;
+	tr.coneShader = FinishShader();
 }
 
 static void CreateExternalShaders( void ) {

code/sys/sys_main.c

@@ -161,6 +161,12 @@ qboolean Sys_WritePIDFile( void )
 	FILE      *f;
 	qboolean  stale = qfalse;
 
+#ifdef WINFOUR
+	// leilei - workaround to avoid crashes on WinNT4/W9X
+	if ( pidFiles )
+		return qfalse;
+#endif
+
 	if( pidFile == NULL )
 		return qfalse;