From 738bc1b80c359aa575efe5c01aaba8066500a684 Mon Sep 17 00:00:00 2001
From: P3rlE <97919909+P3rlE@users.noreply.github.com>
Date: Wed, 2 Mar 2022 05:55:45 +0100
Subject: [PATCH] make quad glow purple

quad purple glow
some preparations for 0.5
---
 engine/code/cgame/cg_players.c | 30 +++++++++++++++++++-
 engine/code/game/bg_public.h   |  2 ++
 engine/code/qcommon/q_shared.h |  2 +-
 q3rallycode.ppr                | 52 ++++++++++++++++------------------
 4 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/engine/code/cgame/cg_players.c b/engine/code/cgame/cg_players.c
index e6d8a50b..5d47571a 100644
--- a/engine/code/cgame/cg_players.c
+++ b/engine/code/cgame/cg_players.c
@@ -2380,7 +2380,8 @@ static void CG_PlayerPowerups( centity_t *cent, refEntity_t *torso ) {
 
 	// quad gives a dlight
 	if ( powerups & ( 1 << PW_QUAD ) ) {
-		trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2f, 0.2f, 1 );
+//		trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2f, 0.2f, 1.0 );
+        trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.63f, 0.13f, 0.94f );
 	}
 
 	// flight plays a looped sound
@@ -2415,6 +2416,33 @@ static void CG_PlayerPowerups( centity_t *cent, refEntity_t *torso ) {
 		trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2f, 0.2f, 1.0 );
 	}
 
+/* finish in 0.5
+
+    // greenflag
+	if ( powerups & ( 1 << PW_GREENFLAG ) ) {
+		if (ci->newAnims){
+			CG_PlayerFlag( cent, cgs.media.greenFlagFlapSkin, torso );
+		}
+		else {
+			CG_TrailItem( cent, cgs.media.greenFlagModel );
+		}
+		trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2f, 1.0, 0.2f );
+	}
+
+    // yellowflag
+	if ( powerups & ( 1 << PW_YELLOWFLAG ) ) {
+		if (ci->newAnims){
+			CG_PlayerFlag( cent, cgs.media.yellowFlagFlapSkin, torso );
+		}
+		else {
+			CG_TrailItem( cent, cgs.media.yellowFlagModel );
+		}
+		trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 1.0, 1.0, 0.2f );
+	}
+
+// end finish in 0.5
+*/
+
 	// neutralflag
 	if ( powerups & ( 1 << PW_NEUTRALFLAG ) ) {
 		if (ci->newAnims) {
diff --git a/engine/code/game/bg_public.h b/engine/code/game/bg_public.h
index 289fadb7..3d3d4933 100644
--- a/engine/code/game/bg_public.h
+++ b/engine/code/game/bg_public.h
@@ -404,6 +404,8 @@ typedef enum {
 
         PW_REDFLAG,
         PW_BLUEFLAG,
+//        PW_GREENFLAG,
+//        PW_YELLOWFLAG,
         PW_NEUTRALFLAG,
 
 #ifdef MISSIONPACK
diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h
index 49d14361..7a831748 100644
--- a/engine/code/qcommon/q_shared.h
+++ b/engine/code/qcommon/q_shared.h
@@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-#define PRODUCT_VERSION "v0.4_r493"   
+#define PRODUCT_VERSION "v0.4_r494"   
 #endif
 
 
diff --git a/q3rallycode.ppr b/q3rallycode.ppr
index 84319af7..37f3e2b1 100644
--- a/q3rallycode.ppr
+++ b/q3rallycode.ppr
@@ -886,37 +886,33 @@ q3rallycode
 		engine\cross-make-mingw64.sh
 [Open project files]
 0=engine\code\qcommon\q_shared.h
-1=engine\code\qcommon\files.c
-2=engine\code\q3_ui\ui_menu.c
-3=engine\code\q3_ui\ui_rally_credits.c
-4=engine\code\cgame\cg_rally_hud.c
-5=engine\code\cgame\cg_rally_hud2.c
-6=engine\code\cgame\cg_draw.c
-7=engine\code\cgame\cg_main.c
+1=engine\code\cgame\cg_ents.c
+2=engine\code\cgame\cg_local.h
+3=engine\code\cgame\cg_main.c
+4=engine\code\cgame\cg_players.c
+5=engine\code\cgame\cg_draw.c
+6=engine\code\game\bg_public.h
 [Selected Project Files]
 Main=
-Selected=engine\code\cgame\cg_main.c
+Selected=engine\code\game\bg_public.h
 [engine\code\qcommon\q_shared.h]
 TopLine=58
 Caret=35,70
-[engine\code\qcommon\files.c]
-TopLine=4189
-Caret=3,4205
-[engine\code\q3_ui\ui_menu.c]
-TopLine=417
-Caret=77,440
-[engine\code\q3_ui\ui_rally_credits.c]
-TopLine=90
-Caret=79,106
-[engine\code\cgame\cg_rally_hud.c]
-TopLine=609
-Caret=14,550
-[engine\code\cgame\cg_rally_hud2.c]
-TopLine=378
-Caret=33,422
-[engine\code\cgame\cg_draw.c]
-TopLine=3052
-Caret=3,3095
+[engine\code\cgame\cg_ents.c]
+TopLine=144
+Caret=1,160
+[engine\code\cgame\cg_local.h]
+TopLine=420
+Caret=1,436
 [engine\code\cgame\cg_main.c]
-TopLine=2166
-Caret=22,2174
+TopLine=1086
+Caret=1,1116
+[engine\code\cgame\cg_players.c]
+TopLine=2407
+Caret=37,2422
+[engine\code\cgame\cg_draw.c]
+TopLine=320
+Caret=1,336
+[engine\code\game\bg_public.h]
+TopLine=390
+Caret=3,408