From 3cbf3b1e4f64b268ecf93757a72f3d6974725a56 Mon Sep 17 00:00:00 2001
From: Andrei Drexler <makro@rq3.com>
Date: Sun, 7 Mar 2004 17:39:11 +0000
Subject: [PATCH] no message

---
 reaction/cgame/cg_local.h |   6 ++
 reaction/cgame/cg_main.c  |  10 ++
 reaction/cgame/cg_view.c  |   5 +
 reaction/cgame/cgame.plg  | 206 +++-----------------------------------
 4 files changed, 37 insertions(+), 190 deletions(-)

diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h
index bc04bc48..ede18954 100644
--- a/reaction/cgame/cg_local.h
+++ b/reaction/cgame/cg_local.h
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.158  2004/03/07 17:39:10  makro
+// no message
+//
 // Revision 1.157  2004/01/26 21:26:08  makro
 // no message
 //
@@ -1905,6 +1908,9 @@ extern vmCvar_t cg_RQ3_predictWeapons;
 
 //Makro - avidemo with jpegs
 extern vmCvar_t cg_RQ3_avidemo;
+//Makro - sun flares
+extern vmCvar_t cg_RQ3_flareIntensity;
+
 extern vmCvar_t cg_drawFriend;
 extern vmCvar_t cg_teamChatsOnly;
 extern vmCvar_t cg_noVoiceChats;
diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c
index c0ce46a0..31dadddd 100644
--- a/reaction/cgame/cg_main.c
+++ b/reaction/cgame/cg_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.145  2004/03/07 17:39:11  makro
+// no message
+//
 // Revision 1.144  2004/01/26 21:26:08  makro
 // no message
 //
@@ -605,6 +608,11 @@ vmCvar_t cg_RQ3_predictWeapons;
 
 //Makro: avidemo with jpegs
 vmCvar_t cg_RQ3_avidemo;
+
+//Makro - sun flares
+vmCvar_t cg_RQ3_flareIntensity;
+
+
 //Makro - fastsky
 vmCvar_t cg_fastSky;
 vmCvar_t cg_RQ3_wantFastSky;
@@ -880,6 +888,8 @@ static cvarTable_t cvarTable[] = {	// bk001129
 	{&cg_trueLightning, "cg_trueLightning", "0.0", CVAR_ARCHIVE},
 	//Makro - avidemo with jpegs
 	{&cg_RQ3_avidemo, "cg_RQ3_avidemo", "0", 0},
+	//Makro - sun flares
+	{&cg_RQ3_flareIntensity, "cg_RQ3_flareIntensity", "1.0", CVAR_ARCHIVE},
 	//Makro - fastsky
 	{&cg_fastSky, "r_fastSky", "0", CVAR_ARCHIVE},
 	{&cg_RQ3_wantFastSky, "cg_RQ3_wantFastSky", "0", CVAR_ARCHIVE},
diff --git a/reaction/cgame/cg_view.c b/reaction/cgame/cg_view.c
index 1646b190..cd2b4ab6 100644
--- a/reaction/cgame/cg_view.c
+++ b/reaction/cgame/cg_view.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.45  2004/03/07 17:39:11  makro
+// no message
+//
 // Revision 1.44  2004/01/28 23:26:33  makro
 // Made flares additive
 //
@@ -1113,6 +1116,8 @@ void CG_AddLensFlare(qboolean sun)
 			ent.shaderRGBA[3] = ent.shaderRGBA[0];
 			trap_R_AddRefEntityToScene(&ent);
 		}
+		//speed hack
+		cgs.flareFadeFactor *= cg_RQ3_flareIntensity.value;
 	} else {
 		//add the reflection particles
 		if (cgs.flareFadeFactor != 0.0f) {
diff --git a/reaction/cgame/cgame.plg b/reaction/cgame/cgame.plg
index 9462337c..ba8c8910 100644
--- a/reaction/cgame/cgame.plg
+++ b/reaction/cgame/cgame.plg
@@ -6,39 +6,13 @@
 --------------------Configuration: cgame - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F2.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP15F.tmp" with contents
 [
 /nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"D:\Work\rq3source\reaction\Release/" /Fp"D:\Work\rq3source\reaction\Release/cgame.pch" /YX /Fo"D:\Work\rq3source\reaction\Release/" /Fd"D:\Work\rq3source\reaction\Release/" /FD /c 
-"D:\Work\rq3source\reaction\game\bg_misc.c"
-"D:\Work\rq3source\reaction\game\bg_pmove.c"
-"D:\Work\rq3source\reaction\game\bg_slidemove.c"
-"D:\Work\rq3source\reaction\cgame\cg_atmospheric.c"
-"D:\Work\rq3source\reaction\cgame\cg_consolecmds.c"
-"D:\Work\rq3source\reaction\cgame\cg_draw.c"
-"D:\Work\rq3source\reaction\cgame\cg_drawtools.c"
-"D:\Work\rq3source\reaction\cgame\cg_effects.c"
-"D:\Work\rq3source\reaction\cgame\cg_ents.c"
-"D:\Work\rq3source\reaction\cgame\cg_event.c"
-"D:\Work\rq3source\reaction\cgame\cg_info.c"
-"D:\Work\rq3source\reaction\cgame\cg_localents.c"
-"D:\Work\rq3source\reaction\cgame\cg_main.c"
-"D:\Work\rq3source\reaction\cgame\cg_marks.c"
-"D:\Work\rq3source\reaction\cgame\cg_players.c"
-"D:\Work\rq3source\reaction\cgame\cg_playerstate.c"
-"D:\Work\rq3source\reaction\cgame\cg_predict.c"
-"D:\Work\rq3source\reaction\cgame\cg_scoreboard.c"
-"D:\Work\rq3source\reaction\cgame\cg_servercmds.c"
-"D:\Work\rq3source\reaction\cgame\cg_snapshot.c"
-"D:\Work\rq3source\reaction\cgame\cg_syscalls.c"
-"D:\Work\rq3source\reaction\cgame\cg_unlagged.c"
 "D:\Work\rq3source\reaction\cgame\cg_view.c"
-"D:\Work\rq3source\reaction\cgame\cg_weapons.c"
-"D:\Work\rq3source\reaction\game\q_math.c"
-"D:\Work\rq3source\reaction\game\q_shared.c"
-"D:\Work\rq3source\reaction\ui\ui_shared.c"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F2.tmp" 
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F3.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP15F.tmp" 
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP160.tmp" with contents
 [
 /nologo /base:"0x30000000" /subsystem:windows /dll /incremental:no /pdb:"D:\Work\rq3source\reaction\Release/cgamex86.pdb" /map:"D:\Work\rq3source\reaction\Release/cgamex86.map" /machine:I386 /def:".\cgame.def" /out:"D:\Work\rq3source\reaction\Release\cgamex86.dll" /implib:"D:\Work\rq3source\reaction\Release/cgamex86.lib" 
 \Work\rq3source\reaction\Release\bg_misc.obj
@@ -69,45 +43,13 @@ Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F3.tmp" with conte
 \Work\rq3source\reaction\Release\q_shared.obj
 \Work\rq3source\reaction\Release\ui_shared.obj
 ]
-Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F3.tmp"
+Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP160.tmp"
 <h3>Output Window</h3>
 Compiling...
-bg_misc.c
-bg_pmove.c
-bg_slidemove.c
-cg_atmospheric.c
-cg_consolecmds.c
-D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(626) : warning C4706: assignment within conditional expression
-D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(638) : warning C4706: assignment within conditional expression
-D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(184) : warning C4701: local variable 'tr' may be used without having been initialized
-D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(334) : warning C4701: local variable 'tr' may be used without having been initialized
-cg_draw.c
-cg_drawtools.c
-cg_effects.c
-cg_ents.c
-cg_event.c
-cg_info.c
-cg_localents.c
-cg_main.c
-cg_marks.c
-cg_players.c
-cg_playerstate.c
-cg_predict.c
-cg_scoreboard.c
-D:\Work\rq3source\reaction\cgame\cg_predict.c(805) : warning C4701: local variable 'predictCmd' may be used without having been initialized
-D:\Work\rq3source\reaction\cgame\cg_predict.c(809) : warning C4701: local variable 'stateIndex' may be used without having been initialized
-cg_servercmds.c
-cg_snapshot.c
-cg_syscalls.c
-cg_unlagged.c
 cg_view.c
-cg_weapons.c
-q_math.c
-q_shared.c
-ui_shared.c
 Linking...
    Creating library D:\Work\rq3source\reaction\Release/cgamex86.lib and object D:\Work\rq3source\reaction\Release/cgamex86.exp
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F7.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP164.tmp" with contents
 [
 /nologo /o"D:\Work\rq3source\reaction\Release/cgame.bsc" 
 \Work\rq3source\reaction\Release\bg_misc.sbr
@@ -137,64 +79,19 @@ Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F7.tmp" with conte
 \Work\rq3source\reaction\Release\q_math.sbr
 \Work\rq3source\reaction\Release\q_shared.sbr
 \Work\rq3source\reaction\Release\ui_shared.sbr]
-Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F7.tmp"
+Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP164.tmp"
 Creating browse info file...
 <h3>Output Window</h3>
 
 
 
 <h3>Results</h3>
-cgamex86.dll - 0 error(s), 6 warning(s)
+cgamex86.dll - 0 error(s), 0 warning(s)
 <h3>
 --------------------Configuration: game - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F8.tmp" with contents
-[
-/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"D:\Work\rq3source\reaction\Release/" /Fp"D:\Work\rq3source\reaction\Release/game.pch" /YX /Fo"D:\Work\rq3source\reaction\Release/" /Fd"D:\Work\rq3source\reaction\Release/" /FD /c 
-"D:\Work\rq3source\reaction\game\ai_chat.c"
-"D:\Work\rq3source\reaction\game\ai_cmd.c"
-"D:\Work\rq3source\reaction\game\ai_dmnet.c"
-"D:\Work\rq3source\reaction\game\ai_dmq3.c"
-"D:\Work\rq3source\reaction\game\ai_main.c"
-"D:\Work\rq3source\reaction\game\ai_team.c"
-"D:\Work\rq3source\reaction\game\ai_vcmd.c"
-"D:\Work\rq3source\reaction\game\bg_misc.c"
-"D:\Work\rq3source\reaction\game\bg_pmove.c"
-"D:\Work\rq3source\reaction\game\bg_slidemove.c"
-"D:\Work\rq3source\reaction\game\g_active.c"
-"D:\Work\rq3source\reaction\game\g_arenas.c"
-"D:\Work\rq3source\reaction\game\g_bot.c"
-"D:\Work\rq3source\reaction\game\g_client.c"
-"D:\Work\rq3source\reaction\game\g_cmds.c"
-"D:\Work\rq3source\reaction\game\g_combat.c"
-"D:\Work\rq3source\reaction\game\g_fileio.c"
-"D:\Work\rq3source\reaction\game\g_items.c"
-"D:\Work\rq3source\reaction\game\g_main.c"
-"D:\Work\rq3source\reaction\game\g_matchmode.c"
-"D:\Work\rq3source\reaction\game\g_mem.c"
-"D:\Work\rq3source\reaction\game\g_misc.c"
-"D:\Work\rq3source\reaction\game\g_missile.c"
-"D:\Work\rq3source\reaction\game\g_mover.c"
-"D:\Work\rq3source\reaction\game\g_session.c"
-"D:\Work\rq3source\reaction\game\g_spawn.c"
-"D:\Work\rq3source\reaction\game\g_svcmds.c"
-"D:\Work\rq3source\reaction\game\g_syscalls.c"
-"D:\Work\rq3source\reaction\game\g_target.c"
-"D:\Work\rq3source\reaction\game\g_team.c"
-"D:\Work\rq3source\reaction\game\g_teamplay.c"
-"D:\Work\rq3source\reaction\game\g_trigger.c"
-"D:\Work\rq3source\reaction\game\g_unlagged.c"
-"D:\Work\rq3source\reaction\game\g_utils.c"
-"D:\Work\rq3source\reaction\game\g_weapon.c"
-"D:\Work\rq3source\reaction\game\q_math.c"
-"D:\Work\rq3source\reaction\game\q_shared.c"
-"D:\Work\rq3source\reaction\game\rxn_game.c"
-"D:\Work\rq3source\reaction\game\zcam.c"
-"D:\Work\rq3source\reaction\game\zcam_target.c"
-]
-Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F8.tmp" 
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F9.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP165.tmp" with contents
 [
 kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"D:\Work\rq3source\reaction\Release/qagamex86.pdb" /map:"D:\Work\rq3source\reaction\Release/qagamex86.map" /machine:I386 /def:".\game.def" /out:"D:\Work\rq3source\reaction\Release\qagamex86.dll" /implib:"D:\Work\rq3source\reaction\Release/qagamex86.lib" 
 \Work\rq3source\reaction\Release\ai_chat.obj
@@ -238,56 +135,11 @@ kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows
 \Work\rq3source\reaction\Release\zcam.obj
 \Work\rq3source\reaction\Release\zcam_target.obj
 ]
-Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F9.tmp"
+Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP165.tmp"
 <h3>Output Window</h3>
-Compiling...
-ai_chat.c
-ai_cmd.c
-ai_dmnet.c
-ai_dmq3.c
-ai_main.c
-ai_team.c
-ai_vcmd.c
-bg_misc.c
-bg_pmove.c
-bg_slidemove.c
-g_active.c
-g_arenas.c
-g_bot.c
-g_client.c
-g_cmds.c
-D:\Work\rq3source\reaction\game\g_client.c(1640) : warning C4701: local variable 'classname' may be used without having been initialized
-D:\Work\rq3source\reaction\game\g_cmds.c(2479) : warning C4189: 'door' : local variable is initialized but not referenced
-g_combat.c
-g_fileio.c
-D:\Work\rq3source\reaction\game\g_combat.c(2014) : warning C4700: local variable 'asave' used without having been initialized
-g_items.c
-g_main.c
-g_matchmode.c
-g_mem.c
-g_misc.c
-g_missile.c
-g_mover.c
-g_session.c
-g_spawn.c
-g_svcmds.c
-g_syscalls.c
-g_target.c
-g_team.c
-g_teamplay.c
-g_trigger.c
-g_unlagged.c
-g_utils.c
-g_weapon.c
-q_math.c
-D:\Work\rq3source\reaction\game\g_weapon.c(1954) : warning C4701: local variable 'tr' may be used without having been initialized
-q_shared.c
-rxn_game.c
-zcam.c
-zcam_target.c
 Linking...
    Creating library D:\Work\rq3source\reaction\Release/qagamex86.lib and object D:\Work\rq3source\reaction\Release/qagamex86.exp
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1FD.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP169.tmp" with contents
 [
 /nologo /o"D:\Work\rq3source\reaction\Release/game.bsc" 
 \Work\rq3source\reaction\Release\ai_chat.sbr
@@ -330,34 +182,19 @@ Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1FD.tmp" with conte
 \Work\rq3source\reaction\Release\rxn_game.sbr
 \Work\rq3source\reaction\Release\zcam.sbr
 \Work\rq3source\reaction\Release\zcam_target.sbr]
-Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1FD.tmp"
+Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP169.tmp"
 Creating browse info file...
 <h3>Output Window</h3>
 
 
 
 <h3>Results</h3>
-qagamex86.dll - 0 error(s), 4 warning(s)
+qagamex86.dll - 0 error(s), 0 warning(s)
 <h3>
 --------------------Configuration: ui - Win32 Release TA--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1FE.tmp" with contents
-[
-/nologo /G6 /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /FR"D:\Work\rq3source\reaction\Release/" /Fp"D:\Work\rq3source\reaction\Release/ta_ui.pch" /YX /Fo"D:\Work\rq3source\reaction\Release/" /Fd"D:\Work\rq3source\reaction\Release/" /FD /c 
-"D:\Work\rq3source\reaction\game\bg_misc.c"
-"D:\Work\rq3source\reaction\game\q_math.c"
-"D:\Work\rq3source\reaction\game\q_shared.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_atoms.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_gameinfo.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_main.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_players.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_shared.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_syscalls.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_util.c"
-]
-Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1FE.tmp" 
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1FF.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP16A.tmp" with contents
 [
 /nologo /base:"0x40000000" /dll /incremental:no /pdb:"D:\Work\rq3source\reaction\Release/uix86.pdb" /map:"D:\Work\rq3source\reaction\Release/uix86.map" /machine:I386 /def:".\ui.def" /out:"D:\Work\rq3source\reaction\Release\uix86.dll" /implib:"D:\Work\rq3source\reaction\Release/uix86.lib" 
 \Work\rq3source\reaction\Release\bg_misc.obj
@@ -371,22 +208,11 @@ Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1FF.tmp" with conte
 \Work\rq3source\reaction\Release\ui_syscalls.obj
 \Work\rq3source\reaction\Release\ui_util.obj
 ]
-Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1FF.tmp"
+Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP16A.tmp"
 <h3>Output Window</h3>
-Compiling...
-bg_misc.c
-q_math.c
-q_shared.c
-ui_atoms.c
-ui_gameinfo.c
-ui_main.c
-ui_players.c
-ui_shared.c
-ui_syscalls.c
-ui_util.c
 Linking...
    Creating library D:\Work\rq3source\reaction\Release/uix86.lib and object D:\Work\rq3source\reaction\Release/uix86.exp
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP203.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP16E.tmp" with contents
 [
 /nologo /o"D:\Work\rq3source\reaction\Release/ta_ui.bsc" 
 \Work\rq3source\reaction\Release\bg_misc.sbr
@@ -399,7 +225,7 @@ Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP203.tmp" with conte
 \Work\rq3source\reaction\Release\ui_shared.sbr
 \Work\rq3source\reaction\Release\ui_syscalls.sbr
 \Work\rq3source\reaction\Release\ui_util.sbr]
-Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP203.tmp"
+Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP16E.tmp"
 Creating browse info file...
 <h3>Output Window</h3>