From 9b411443d9b2e879eb5ac99d1416493d6f823537 Mon Sep 17 00:00:00 2001
From: Petr Bartos <petr.bartos@plus4u.net>
Date: Thu, 31 Mar 2022 18:59:45 +0200
Subject: [PATCH] Implemented separate setting for player and opponents shadows

---
 android/app/src/main/assets/pakQ3Q.pk3        | Bin 322507 -> 322586 bytes
 .../app/src/main/cpp/code/cgame/cg_local.h    |   1 +
 android/app/src/main/cpp/code/cgame/cg_main.c |   2 +
 .../app/src/main/cpp/code/cgame/cg_players.c  |  24 +++++--
 .../app/src/main/cpp/code/q3_ui/ui_video.c    |  68 ++++++++++++++++--
 .../cpp/code/renderergles3/tr_animation.c     |   4 +-
 .../src/main/cpp/code/renderergles3/tr_init.c |   2 +
 .../main/cpp/code/renderergles3/tr_local.h    |   3 +-
 .../src/main/cpp/code/renderergles3/tr_mesh.c |   6 +-
 .../cpp/code/renderergles3/tr_model_iqm.c     |   6 +-
 .../main/cpp/code/renderergles3/tr_shadows.c  |   2 +-
 android/app/src/main/cpp/code/ui/ui_main.c    |   4 ++
 .../app/src/main/pakQ3Q/ui/ingame_system.menu |  26 +++++--
 android/app/src/main/pakQ3Q/ui/system.menu    |  26 +++++--
 14 files changed, 141 insertions(+), 33 deletions(-)

diff --git a/android/app/src/main/assets/pakQ3Q.pk3 b/android/app/src/main/assets/pakQ3Q.pk3
index 9b8480018675ce812feeba0229032e183410c591..b9ef2dcff42a49b731ca3ce1eb4ce42c7719c7e0 100644
GIT binary patch
delta 4638
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
U>jY8(<d=o(1V9G**aQFo0Qou5EdT%j

delta 4563
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

diff --git a/android/app/src/main/cpp/code/cgame/cg_local.h b/android/app/src/main/cpp/code/cgame/cg_local.h
index a5c81a85..79efe262 100644
--- a/android/app/src/main/cpp/code/cgame/cg_local.h
+++ b/android/app/src/main/cpp/code/cgame/cg_local.h
@@ -1122,6 +1122,7 @@ extern	vmCvar_t		cg_bobroll;
 extern	vmCvar_t		cg_weaponbob;
 extern	vmCvar_t		cg_swingSpeed;
 extern	vmCvar_t		cg_shadows;
+extern	vmCvar_t		cg_playerShadow;
 extern	vmCvar_t		cg_gibs;
 extern	vmCvar_t		cg_megagibs;
 extern	vmCvar_t		cg_drawTimer;
diff --git a/android/app/src/main/cpp/code/cgame/cg_main.c b/android/app/src/main/cpp/code/cgame/cg_main.c
index b43ebc4b..fa450413 100644
--- a/android/app/src/main/cpp/code/cgame/cg_main.c
+++ b/android/app/src/main/cpp/code/cgame/cg_main.c
@@ -106,6 +106,7 @@ vmCvar_t	cg_bobroll;
 vmCvar_t	cg_weaponbob;
 vmCvar_t	cg_swingSpeed;
 vmCvar_t	cg_shadows;
+vmCvar_t	cg_playerShadow;
 vmCvar_t	cg_gibs;
 vmCvar_t	cg_megagibs;
 vmCvar_t	cg_drawTimer;
@@ -228,6 +229,7 @@ static cvarTable_t cvarTable[] = {
 	{ &cg_fov, "cg_fov", "90", CVAR_ARCHIVE },
 	{ &cg_viewsize, "cg_viewsize", "100", CVAR_ARCHIVE },
 	{ &cg_shadows, "cg_shadows", "1", CVAR_ARCHIVE  },
+	{ &cg_playerShadow, "cg_playerShadow", "1", CVAR_ARCHIVE  },
 	{ &cg_gibs, "cg_gibs", "1", CVAR_ARCHIVE  },
 	{ &cg_megagibs, "cg_megagibs", "0", CVAR_ARCHIVE  },
 	{ &cg_draw2D, "cg_draw2D", "1", CVAR_ARCHIVE  },
diff --git a/android/app/src/main/cpp/code/cgame/cg_players.c b/android/app/src/main/cpp/code/cgame/cg_players.c
index 1afd526f..f6f06c64 100644
--- a/android/app/src/main/cpp/code/cgame/cg_players.c
+++ b/android/app/src/main/cpp/code/cgame/cg_players.c
@@ -2071,7 +2071,9 @@ static qboolean CG_PlayerShadow( centity_t *cent, float *shadowPlane ) {
 
 	*shadowPlane = 0;
 
-	if ( cg_shadows.integer == 0 ) {
+	qboolean clientPlayer = cent->currentState.number == cg.snap->ps.clientNum;
+
+	if ( (clientPlayer && cg_playerShadow.integer == 0) || (!clientPlayer && cg_shadows.integer == 0) ) {
 		return qfalse;
 	}
 
@@ -2080,6 +2082,11 @@ static qboolean CG_PlayerShadow( centity_t *cent, float *shadowPlane ) {
 		return qfalse;
 	}
 
+	// no shadow if VR player is dead
+	if ( clientPlayer && ( cg.predictedPlayerState.stats[STAT_HEALTH] <= 0 ) ) {
+		return qfalse;
+	}
+
 	// send a trace down from the player to the ground
 	VectorCopy( cent->lerpOrigin, end );
 	end[2] -= SHADOW_DISTANCE;
@@ -2093,7 +2100,8 @@ static qboolean CG_PlayerShadow( centity_t *cent, float *shadowPlane ) {
 
 	*shadowPlane = trace.endpos[2] + 1;
 
-	if ( cg_shadows.integer != 1 ) {	// no mark for stencil or projection shadows
+	// no mark for stencil or projection shadows
+	if ( (clientPlayer && cg_playerShadow.integer != 1) || (!clientPlayer && cg_shadows.integer != 1) ) {
 		return qtrue;
 	}
 
@@ -2101,11 +2109,11 @@ static qboolean CG_PlayerShadow( centity_t *cent, float *shadowPlane ) {
 	alpha = 1.0 - trace.fraction;
 
 	// hack / FPE - bogus planes?
-	//assert( DotProduct( trace.plane.normal, trace.plane.normal ) != 0.0f ) 
+	//assert( DotProduct( trace.plane.normal, trace.plane.normal ) != 0.0f )
 
 	// add the mark as a temporary, so it goes directly to the renderer
 	// without taking a spot in the cg_marks array
-	CG_ImpactMark( cgs.media.shadowMarkShader, trace.endpos, trace.plane.normal, 
+	CG_ImpactMark( cgs.media.shadowMarkShader, trace.endpos, trace.plane.normal,
 		cent->pe.legs.yawAngle, alpha,alpha,alpha,1, qfalse, 24, qtrue );
 
 	return qtrue;
@@ -2125,7 +2133,9 @@ static void CG_PlayerSplash( centity_t *cent ) {
 	int			contents;
 	polyVert_t	verts[4];
 
-	if ( !cg_shadows.integer ) {
+	qboolean clientPlayer = cent->currentState.number == cg.snap->ps.clientNum;
+
+	if ( (clientPlayer && !cg_playerShadow.integer) || (!clientPlayer && !cg_shadows.integer) ) {
 		return;
 	}
 
@@ -2391,7 +2401,9 @@ void CG_Player( centity_t *cent ) {
 	// add a water splash if partially in and out of water
 	CG_PlayerSplash( cent );
 
-	if ( cg_shadows.integer == 3 && shadow ) {
+	qboolean clientPlayer = cent->currentState.number == cg.snap->ps.clientNum;
+
+	if ( shadow && ( (clientPlayer && cg_playerShadow.integer == 3) || (!clientPlayer && cg_shadows.integer == 3) ) ) {
 		renderfx |= RF_SHADOW_PLANE;
 	}
 	renderfx |= RF_LIGHTING_ORIGIN;			// use the same origin for all
diff --git a/android/app/src/main/cpp/code/q3_ui/ui_video.c b/android/app/src/main/cpp/code/q3_ui/ui_video.c
index 658a51af..da61a780 100644
--- a/android/app/src/main/cpp/code/q3_ui/ui_video.c
+++ b/android/app/src/main/cpp/code/q3_ui/ui_video.c
@@ -252,10 +252,11 @@ GRAPHICS OPTIONS MENU
 #define ID_DYNAMICLIGHTS	112
 #define ID_SYNCEVERYFRAME	113
 #define ID_SHADOWS		114
-#define ID_GAMMA		115
+#define ID_PLAYERSHADOW	115
+#define ID_GAMMA		116
 
 #define	NUM_REFRESHRATE	4
-#define NUM_SHADOWS 2
+#define NUM_SHADOWS 3
 
 typedef struct {
 	menuframework_s	menu;
@@ -286,6 +287,7 @@ typedef struct {
 	menuradiobutton_s	dynamiclights;
 	menuradiobutton_s	synceveryframe;
 	menulist_s		shadows;
+	menulist_s		playershadow;
 	menuslider_s	gamma;
 
 	menubitmap_s	apply;
@@ -308,6 +310,7 @@ typedef struct
 	qboolean dynamiclights;
 	qboolean synceveryframe;
 	int shadows;
+	int playershadow;
 	float gamma;
 } InitialVideoOptions_s;
 
@@ -501,6 +504,7 @@ static void GraphicsOptions_GetInitialVideo( void )
 	s_ivo.dynamiclights = s_graphicsoptions.dynamiclights.curvalue;
 	s_ivo.synceveryframe = s_graphicsoptions.synceveryframe.curvalue;
 	s_ivo.shadows     = s_graphicsoptions.refreshrate.curvalue;
+	s_ivo.playershadow	= s_graphicsoptions.playershadow.curvalue;
 	s_ivo.gamma       = s_graphicsoptions.gamma.curvalue;
 }
 
@@ -836,8 +840,11 @@ static void GraphicsOptions_Event( void* ptr, int event ) {
 			int shadows;
 			switch (s_graphicsoptions.shadows.curvalue) {
 				case 0:
-					shadows = 1;
+					shadows = 0;
 					break;
+				case 1:
+				    shadows = 1;
+				    break;
 				default:
 					shadows = 3;
 					break;
@@ -846,6 +853,23 @@ static void GraphicsOptions_Event( void* ptr, int event ) {
 		}
 		break;
 
+	case ID_PLAYERSHADOW: {
+			int shadow;
+			switch (s_graphicsoptions.playershadow.curvalue) {
+				case 0:
+					shadow = 0;
+					break;
+				case 1:
+				    shadow = 1;
+				    break;
+				default:
+					shadow = 3;
+					break;
+				}
+			trap_Cvar_SetValue("cg_playerShadow", shadow);
+		}
+		break;
+
 	case ID_GAMMA:
 		trap_Cvar_SetValue( "r_gamma", s_graphicsoptions.gamma.curvalue );
 		break;
@@ -1046,12 +1070,28 @@ static void GraphicsOptions_SetMenuItems( void )
 
 	switch ( (int) trap_Cvar_VariableValue( "cg_shadows" ) )
 	{
-		case 1:
+		case 0:
 			s_graphicsoptions.shadows.curvalue = 0;
 			break;
-		default:
+		case 1:
 			s_graphicsoptions.shadows.curvalue = 1;
 			break;
+		default:
+			s_graphicsoptions.shadows.curvalue = 2;
+			break;
+	}
+
+	switch ( (int) trap_Cvar_VariableValue( "cg_playerShadow" ) )
+	{
+		case 0:
+			s_graphicsoptions.playershadow.curvalue = 0;
+			break;
+		case 1:
+			s_graphicsoptions.playershadow.curvalue = 1;
+			break;
+		default:
+			s_graphicsoptions.playershadow.curvalue = 2;
+			break;
 	}
 
 	s_graphicsoptions.dynamiclights.curvalue	= trap_Cvar_VariableValue( "r_dynamiclight" ) != 0;
@@ -1137,6 +1177,7 @@ void GraphicsOptions_MenuInit( void )
 	};
 	static const char *s_shadows[] =
 	{
+		"None",
 		"Low",
 		"High",
 		NULL
@@ -1219,7 +1260,7 @@ void GraphicsOptions_MenuInit( void )
 	s_graphicsoptions.network.style				= UI_RIGHT;
 	s_graphicsoptions.network.color				= color_red;
 
-	y = 254 - 4 * (BIGCHAR_HEIGHT + 2);
+	y = 254 - 5 * (BIGCHAR_HEIGHT + 2);
 //	s_graphicsoptions.list.generic.type     = MTYPE_SPINCONTROL;
 //	s_graphicsoptions.list.generic.name     = "Graphics Settings:";
 //	s_graphicsoptions.list.generic.flags    = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
@@ -1342,7 +1383,7 @@ void GraphicsOptions_MenuInit( void )
 
 	// references "cg_shadows"
 	s_graphicsoptions.shadows.generic.type		= MTYPE_SPINCONTROL;
-	s_graphicsoptions.shadows.generic.name		= "Shadow Detail:";
+	s_graphicsoptions.shadows.generic.name		= "Opponent Shadows:";
 	s_graphicsoptions.shadows.generic.flags		= QMF_PULSEIFFOCUS|QMF_SMALLFONT;
 	s_graphicsoptions.shadows.generic.x			= 400;
 	s_graphicsoptions.shadows.generic.y			= y;
@@ -1352,6 +1393,18 @@ void GraphicsOptions_MenuInit( void )
 	s_graphicsoptions.shadows.numitems			= NUM_SHADOWS;
 	y += BIGCHAR_HEIGHT+2;
 
+	// references "cg_playerShadow"
+	s_graphicsoptions.playershadow.generic.type		= MTYPE_SPINCONTROL;
+	s_graphicsoptions.playershadow.generic.name		= "Player Shadow:";
+	s_graphicsoptions.playershadow.generic.flags		= QMF_PULSEIFFOCUS|QMF_SMALLFONT;
+	s_graphicsoptions.playershadow.generic.x			= 400;
+	s_graphicsoptions.playershadow.generic.y			= y;
+	s_graphicsoptions.playershadow.itemnames	        = s_shadows;
+	s_graphicsoptions.playershadow.generic.callback	= GraphicsOptions_Event;
+	s_graphicsoptions.playershadow.generic.id		= ID_PLAYERSHADOW;
+	s_graphicsoptions.playershadow.numitems			= NUM_SHADOWS;
+	y += BIGCHAR_HEIGHT+2;
+
 	// references/modifies "r_lodBias" & "subdivisions"
 	s_graphicsoptions.geometry.generic.type  = MTYPE_SPINCONTROL;
 	s_graphicsoptions.geometry.generic.name	 = "Geometric Detail:";
@@ -1443,6 +1496,7 @@ void GraphicsOptions_MenuInit( void )
 	Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.lighting );
 	Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.dynamiclights );
 	Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.shadows );
+	Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.playershadow );
 	Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.geometry );
 	Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.tq );
 //	Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.texturebits );
diff --git a/android/app/src/main/cpp/code/renderergles3/tr_animation.c b/android/app/src/main/cpp/code/renderergles3/tr_animation.c
index 38fffc64..95c54019 100644
--- a/android/app/src/main/cpp/code/renderergles3/tr_animation.c
+++ b/android/app/src/main/cpp/code/renderergles3/tr_animation.c
@@ -243,7 +243,7 @@ void R_MDRAddAnimSurfaces( trRefEntity_t *ent ) {
 	}
 	
 	// set up lighting
-	if ( !personalModel || r_shadows->integer > 1 )
+	if ( !personalModel || r_shadows->integer > 1 || r_playerShadow->integer > 1)
 	{
 		R_SetupEntityLighting( &tr.refdef, ent );
 	}
@@ -292,7 +292,7 @@ void R_MDRAddAnimSurfaces( trRefEntity_t *ent ) {
 		}
 
 		// projection shadows work fine with personal models
-		if ( r_shadows->integer == 3
+		if ( (r_shadows->integer == 3 || r_playerShadow->integer == 3)
 			&& fogNum == 0
 			&& (ent->e.renderfx & RF_SHADOW_PLANE )
 			&& shader->sort == SS_OPAQUE )
diff --git a/android/app/src/main/cpp/code/renderergles3/tr_init.c b/android/app/src/main/cpp/code/renderergles3/tr_init.c
index f87a8516..11eac968 100644
--- a/android/app/src/main/cpp/code/renderergles3/tr_init.c
+++ b/android/app/src/main/cpp/code/renderergles3/tr_init.c
@@ -181,6 +181,7 @@ cvar_t	*r_lightmap;
 cvar_t	*r_vertexLight;
 cvar_t	*r_uiFullScreen;
 cvar_t	*r_shadows;
+cvar_t	*r_playerShadow;
 cvar_t	*r_flares;
 cvar_t	*r_mode;
 cvar_t	*r_nobind;
@@ -1377,6 +1378,7 @@ void R_Register( void )
 	r_lockpvs = ri.Cvar_Get ("r_lockpvs", "0", CVAR_CHEAT);
 	r_noportals = ri.Cvar_Get ("r_noportals", "0", CVAR_CHEAT);
 	r_shadows = ri.Cvar_Get( "cg_shadows", "1", 0 );
+	r_playerShadow = ri.Cvar_Get( "cg_playerShadow", "1", 0);
 
 	r_marksOnTriangleMeshes = ri.Cvar_Get("r_marksOnTriangleMeshes", "0", CVAR_ARCHIVE);
 
diff --git a/android/app/src/main/cpp/code/renderergles3/tr_local.h b/android/app/src/main/cpp/code/renderergles3/tr_local.h
index 16086877..ed3f2bc7 100644
--- a/android/app/src/main/cpp/code/renderergles3/tr_local.h
+++ b/android/app/src/main/cpp/code/renderergles3/tr_local.h
@@ -1748,7 +1748,8 @@ extern	cvar_t	*r_showsky;						// forces sky in front of all surfaces
 extern	cvar_t	*r_shownormals;					// draws wireframe normals
 extern	cvar_t	*r_clear;						// force screen clear every frame
 
-extern	cvar_t	*r_shadows;						// controls shadows: 0 = none, 1 = blur, 2 = stencil, 3 = black planar projection
+extern	cvar_t	*r_shadows;						// controls global shadows: 0 = none, 1 = blur, 2 = stencil, 3 = black planar projection
+extern	cvar_t	*r_playerShadow;				// controls player shadow: 0 = none, 1 = blur, 2 = stencil, 3 = black planar projection
 extern	cvar_t	*r_flares;						// light flares
 
 extern	cvar_t	*r_intensity;
diff --git a/android/app/src/main/cpp/code/renderergles3/tr_mesh.c b/android/app/src/main/cpp/code/renderergles3/tr_mesh.c
index 967199d0..6f993059 100644
--- a/android/app/src/main/cpp/code/renderergles3/tr_mesh.c
+++ b/android/app/src/main/cpp/code/renderergles3/tr_mesh.c
@@ -350,7 +350,7 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
 	//
 	// set up lighting now that we know we aren't culled
 	//
-	if ( !personalModel || r_shadows->integer > 1 ) {
+	if ( !personalModel || r_shadows->integer > 1 || r_playerShadow->integer > 1) {
 		R_SetupEntityLighting( &tr.refdef, ent );
 	}
 
@@ -400,7 +400,7 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
 
 		// stencil shadows can't do personal models unless I polyhedron clip
 		if ( !personalModel
-			&& r_shadows->integer == 2 
+			&& r_shadows->integer == 2
 			&& fogNum == 0
 			&& !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) ) 
 			&& shader->sort == SS_OPAQUE ) {
@@ -408,7 +408,7 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
 		}
 
 		// projection shadows work fine with personal models
-		if ( r_shadows->integer == 3
+		if ( (r_shadows->integer == 3 || r_playerShadow->integer == 3)
 			&& fogNum == 0
 			&& (ent->e.renderfx & RF_SHADOW_PLANE )
 			&& shader->sort == SS_OPAQUE ) {
diff --git a/android/app/src/main/cpp/code/renderergles3/tr_model_iqm.c b/android/app/src/main/cpp/code/renderergles3/tr_model_iqm.c
index 165ac75c..a94486ee 100644
--- a/android/app/src/main/cpp/code/renderergles3/tr_model_iqm.c
+++ b/android/app/src/main/cpp/code/renderergles3/tr_model_iqm.c
@@ -1276,7 +1276,7 @@ void R_AddIQMSurfaces( trRefEntity_t *ent ) {
 	//
 	// set up lighting now that we know we aren't culled
 	//
-	if ( !personalModel || r_shadows->integer > 1 ) {
+	if ( !personalModel || r_shadows->integer > 1 || r_playerShadow->integer > 1) {
 		R_SetupEntityLighting( &tr.refdef, ent );
 	}
 
@@ -1317,7 +1317,7 @@ void R_AddIQMSurfaces( trRefEntity_t *ent ) {
 
 		// stencil shadows can't do personal models unless I polyhedron clip
 		if ( !personalModel
-			&& r_shadows->integer == 2 
+			&& r_shadows->integer == 2
 			&& fogNum == 0
 			&& !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) ) 
 			&& shader->sort == SS_OPAQUE ) {
@@ -1325,7 +1325,7 @@ void R_AddIQMSurfaces( trRefEntity_t *ent ) {
 		}
 
 		// projection shadows work fine with personal models
-		if ( r_shadows->integer == 3
+		if ( (r_shadows->integer == 3 || r_playerShadow->integer == 3)
 			&& fogNum == 0
 			&& (ent->e.renderfx & RF_SHADOW_PLANE )
 			&& shader->sort == SS_OPAQUE ) {
diff --git a/android/app/src/main/cpp/code/renderergles3/tr_shadows.c b/android/app/src/main/cpp/code/renderergles3/tr_shadows.c
index 697800c1..79915f1e 100644
--- a/android/app/src/main/cpp/code/renderergles3/tr_shadows.c
+++ b/android/app/src/main/cpp/code/renderergles3/tr_shadows.c
@@ -252,7 +252,7 @@ overlap and double darken.
 void RB_ShadowFinish( void ) {
 	// FIXME: implement this
 #if 0
-	if ( r_shadows->integer != 2 ) {
+	if ( r_shadows->integer != 2 || r_playerShadow->integer != 2) {
 		return;
 	}
 	if ( glConfig.stencilBits < 4 ) {
diff --git a/android/app/src/main/cpp/code/ui/ui_main.c b/android/app/src/main/cpp/code/ui/ui_main.c
index 112183c1..4d3b5ca5 100644
--- a/android/app/src/main/cpp/code/ui/ui_main.c
+++ b/android/app/src/main/cpp/code/ui/ui_main.c
@@ -3102,6 +3102,7 @@ static void UI_Update(const char *name) {
 				trap_Cvar_SetValue( "r_fastSky", 0 );
 				trap_Cvar_SetValue( "r_inGameVideo", 1 );
 				trap_Cvar_SetValue( "cg_shadows", 1 );
+				trap_Cvar_SetValue( "cg_playerShadow", 1 );
 				trap_Cvar_SetValue( "cg_brassTime", 2500 );
 				trap_Cvar_Set( "r_texturemode", "GL_LINEAR_MIPMAP_LINEAR" );
 			break;
@@ -3122,6 +3123,7 @@ static void UI_Update(const char *name) {
 				trap_Cvar_SetValue( "cg_brassTime", 2500 );
 				trap_Cvar_Set( "r_texturemode", "GL_LINEAR_MIPMAP_LINEAR" );
 				trap_Cvar_SetValue( "cg_shadows", 0 );
+				trap_Cvar_SetValue( "cg_playerShadow", 0 );
 			break;
 			case 2: // fast
 				trap_Cvar_SetValue( "r_fullScreen", 1 );
@@ -3136,6 +3138,7 @@ static void UI_Update(const char *name) {
 				trap_Cvar_Set( "ui_videomode", "640x480" );
 				trap_Cvar_SetValue( "r_texturebits", 0 );
 				trap_Cvar_SetValue( "cg_shadows", 0 );
+				trap_Cvar_SetValue( "cg_playerShadow", 0 );
 				trap_Cvar_SetValue( "r_fastSky", 1 );
 				trap_Cvar_SetValue( "r_inGameVideo", 0 );
 				trap_Cvar_SetValue( "cg_brassTime", 0 );
@@ -3154,6 +3157,7 @@ static void UI_Update(const char *name) {
 				trap_Cvar_SetValue( "r_picmip", 2 );
 				trap_Cvar_SetValue( "r_texturebits", 16 );
 				trap_Cvar_SetValue( "cg_shadows", 0 );
+				trap_Cvar_SetValue( "cg_playerShadow", 0 );
 				trap_Cvar_SetValue( "cg_brassTime", 0 );
 				trap_Cvar_SetValue( "r_fastSky", 1 );
 				trap_Cvar_SetValue( "r_inGameVideo", 0 );
diff --git a/android/app/src/main/pakQ3Q/ui/ingame_system.menu b/android/app/src/main/pakQ3Q/ui/ingame_system.menu
index 6c7b4205..629af318 100644
--- a/android/app/src/main/pakQ3Q/ui/ingame_system.menu
+++ b/android/app/src/main/pakQ3Q/ui/ingame_system.menu
@@ -295,9 +295,9 @@ itemDef {
       		name graphics
 		group grpSystem
 		type ITEM_TYPE_MULTI
-		text "Shadow Detail:"
+		text "Opponent Shadows:"
 		cvar "cg_shadows"
-		cvarFloatList { "Low" 1 "High" 3 }
+		cvarFloatList { "None" 0 "Low" 1 "High" 3 }
 		rect 0 150 306 20
       		textalign ITEM_ALIGN_RIGHT
       		textalignx 133
@@ -307,6 +307,22 @@ itemDef {
       		visible 0
     		}
 
+	itemDef {
+      		name graphics
+		group grpSystem
+		type ITEM_TYPE_MULTI
+		text "Player Shadow:"
+		cvar "cg_playerShadow"
+		cvarFloatList { "None" 0 "Low" 1 "High" 3 }
+		rect 0 170 306 20
+      		textalign ITEM_ALIGN_RIGHT
+      		textalignx 133
+      		textaligny 17
+		textscale .25
+      		forecolor 1 1 1 1
+      		visible 0
+    		}
+
 	itemDef {
       		name graphics
 		group grpSystem
@@ -314,7 +330,7 @@ itemDef {
 		text "Geometric Detail:"
 		cvar "r_lodbias"
 		cvarFloatList { "High" -1 "Medium" 1 "Low" 2 }
-		rect 0 170 256 20
+		rect 0 190 256 20
       		textalign ITEM_ALIGN_RIGHT
       		textalignx 133
       		textaligny 17
@@ -331,7 +347,7 @@ itemDef {
 		text "Texture Detail:"
 		cvar "r_picmip"
 		cvarFloatList { "Low" 2 "Normal" 1 "High" 0 }
-		rect 0 190 256 20
+		rect 0 210 256 20
       		textalign ITEM_ALIGN_RIGHT
       		textalignx 133
       		textaligny 17
@@ -380,7 +396,7 @@ itemDef {
       		type ITEM_TYPE_YESNO
 		text "Compress Textures:"
 		cvar "r_ext_compressed_textures"
-		rect 0 210 256 20
+		rect 0 230 256 20
       		textalign ITEM_ALIGN_RIGHT
       		textalignx 133
       		textaligny 17
diff --git a/android/app/src/main/pakQ3Q/ui/system.menu b/android/app/src/main/pakQ3Q/ui/system.menu
index 23855dd4..a4ab0121 100755
--- a/android/app/src/main/pakQ3Q/ui/system.menu
+++ b/android/app/src/main/pakQ3Q/ui/system.menu
@@ -198,9 +198,9 @@ itemDef {
   		name graphics
 		group grpSystem
    		type ITEM_TYPE_MULTI
-		text "Shadow Detail:"
+		text "Opponent Shadows:"
 		cvar "cg_shadows"
-		cvarFloatList { "Low" 1 "High" 3 }
+		cvarFloatList { "None" 0 "Low" 1 "High" 3 }
 		rect 99 167 256 20
    		textalign ITEM_ALIGN_RIGHT
   		textalignx 128
@@ -210,6 +210,22 @@ itemDef {
    		visible 0
 	}
 
+	itemDef {
+  		name graphics
+		group grpSystem
+   		type ITEM_TYPE_MULTI
+		text "Player Shadow:"
+		cvar "cg_playerShadow"
+		cvarFloatList { "None" 0 "Low" 1 "High" 3 }
+		rect 99 192 256 20
+   		textalign ITEM_ALIGN_RIGHT
+  		textalignx 128
+   		textaligny 20
+		textscale .333
+   		forecolor 1 1 1 1
+   		visible 0
+	}
+
 	itemDef {
    		name graphics
 		group grpSystem
@@ -217,7 +233,7 @@ itemDef {
 		text "Geometric Detail:"
 		cvar "r_lodbias"
 		cvarFloatList { "High" -1 "Medium" 1 "Low" 2 }
-		rect 99 192 256 20
+		rect 99 217 256 20
       		textalign ITEM_ALIGN_RIGHT
       		textalignx 128
       		textaligny 20
@@ -234,7 +250,7 @@ itemDef {
 		text "Texture Detail:"
 		cvar "r_picmip"
 		cvarFloatList { "Low" 2 "Normal" 1 "High" 0 }
-		rect 99 217 256 20
+		rect 99 242 256 20
       		textalign ITEM_ALIGN_RIGHT
       		textalignx 128
       		textaligny 20
@@ -283,7 +299,7 @@ itemDef {
       		type ITEM_TYPE_YESNO
 		text "Compress Textures:"
 		cvar "r_ext_compressed_textures"
-		rect 99 242 256 20
+		rect 99 267 256 20
       		textalign ITEM_ALIGN_RIGHT
       		textalignx 128
       		textaligny 20