From 9a340f3914288600714439326b60e5f6f6346066 Mon Sep 17 00:00:00 2001
From: Robert Beckebans <robert.beckebans@gmail.com>
Date: Sun, 3 Jul 2016 15:33:01 +0200
Subject: [PATCH] Renamed Flash GUI development cvars to postLoadFlash*

---
 neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp |  8 ++++----
 neo/renderer/tr_frontend_addlights.cpp          |  8 ++++----
 neo/swf/SWF_Main.cpp                            | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp b/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp
index 816bbbf7..04ad23c8 100644
--- a/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp
+++ b/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp
@@ -125,8 +125,8 @@ void idMenuScreen_Shell_GameOptions::Initialize( idMenuHandler* data )
 	control->SetupEvents( DEFAULT_REPEAT_TIME, options->GetChildren().Num() );
 	control->AddEventAction( WIDGET_EVENT_PRESS ).Set( WIDGET_ACTION_PRESS_FOCUSED, options->GetChildren().Num() );
 	options->AddChild( control );
-
-	control = new(TAG_SWF)idMenuWidget_ControlButton();
+	
+	control = new( TAG_SWF )idMenuWidget_ControlButton();
 	control->SetOptionType( OPTION_SLIDER_TOGGLE );
 	control->SetLabel( "muzzle flashes" );
 	control->SetDataSource( &systemData, idMenuDataSource_GameSettings::GAME_FIELD_MUZZLE_FLASHES );
@@ -417,8 +417,8 @@ bool idMenuScreen_Shell_GameOptions::idMenuDataSource_GameSettings::IsDataChange
 	{
 		return true;
 	}
-
-	if (fields[ GAME_FIELD_MUZZLE_FLASHES ].ToBool() != originalFields[ GAME_FIELD_MUZZLE_FLASHES ].ToBool() )
+	
+	if( fields[ GAME_FIELD_MUZZLE_FLASHES ].ToBool() != originalFields[ GAME_FIELD_MUZZLE_FLASHES ].ToBool() )
 	{
 		return true;
 	}
diff --git a/neo/renderer/tr_frontend_addlights.cpp b/neo/renderer/tr_frontend_addlights.cpp
index 63683f04..51f820ec 100644
--- a/neo/renderer/tr_frontend_addlights.cpp
+++ b/neo/renderer/tr_frontend_addlights.cpp
@@ -405,10 +405,10 @@ static void R_AddSingleLight( viewLight_t* vLight )
 			// A more general solution would be to have an allowLightOnEntityID field.
 			// HACK: the armor-mounted flashlight is a private spot light, which is probably
 			// wrong -- you would expect to see them in multiplayer.
-		//	if( light->parms.allowLightInViewID && light->parms.pointLight && !eParms.weaponDepthHack )
-		//	{
-		//		continue;
-		//	}
+			//	if( light->parms.allowLightInViewID && light->parms.pointLight && !eParms.weaponDepthHack )
+			//	{
+			//		continue;
+			//	}
 			
 			// non-shadow casting entities don't need to be added if they aren't
 			// directly visible
diff --git a/neo/swf/SWF_Main.cpp b/neo/swf/SWF_Main.cpp
index c89ad6f3..10f19863 100644
--- a/neo/swf/SWF_Main.cpp
+++ b/neo/swf/SWF_Main.cpp
@@ -35,9 +35,9 @@ If you have questions concerning this license or the applicable additional terms
 
 idCVar swf_loadBinary( "swf_loadBinary", "1", CVAR_INTEGER, "used to set whether to load binary swf from generated" );
 // RB begin
-idCVar swf_exportAtlas( "swf_exportAtlas", "0", CVAR_INTEGER, "" );
-idCVar swf_exportSWF( "swf_exportSWF", "1", CVAR_INTEGER, "" );
-idCVar swf_exportJSON( "swf_exportJSON", "1", CVAR_INTEGER, "" );
+idCVar postLoadExportFlashAtlas( "postLoadExportFlashAtlas", "0", CVAR_INTEGER, "" );
+idCVar postLoadExportFlashToSWF( "postLoadExportFlashToSWF", "0", CVAR_INTEGER, "" );
+idCVar postLoadExportFlashToJSON( "postLoadExportFlashToJSON", "0", CVAR_INTEGER, "" );
 // RB end
 
 int idSWF::mouseX = -1;
@@ -179,7 +179,7 @@ idSWF::idSWF( const char* filename_, idSoundWorld* soundWorld_ )
 		}
 	}
 	
-	if( swf_exportJSON.GetBool() )
+	if( postLoadExportFlashToSWF.GetBool() )
 	{
 		idStr jsonFileName = "exported/";
 		jsonFileName += filename;
@@ -196,7 +196,7 @@ idSWF::idSWF( const char* filename_, idSoundWorld* soundWorld_ )
 	int atlasExportImageWidth = 0;
 	int atlasExportImageHeight = 0;
 	
-	if( /*!loadedFromJSON &&*/ ( swf_exportAtlas.GetBool() || swf_exportSWF.GetBool() ) )
+	if( /*!loadedFromJSON &&*/ ( postLoadExportFlashToJSON.GetBool() || postLoadExportFlashAtlas.GetBool() || postLoadExportFlashToSWF.GetBool() ) )
 	{
 		idStrStatic< MAX_OSPATH > generatedName = atlasFileName;
 		generatedName.StripFileExtension();
@@ -296,7 +296,7 @@ idSWF::idSWF( const char* filename_, idSoundWorld* soundWorld_ )
 			
 			R_WritePNG( atlasFileNameExport, rgba.Ptr(), 4, img.width, img.height, true, "fs_basepath" );
 			
-			if( swf_exportSWF.GetBool() )
+			if( postLoadExportFlashToSWF.GetBool() )
 			{
 				atlasExportImageWidth = img.width;
 				atlasExportImageHeight = img.height;
@@ -306,7 +306,7 @@ idSWF::idSWF( const char* filename_, idSoundWorld* soundWorld_ )
 		}
 	}
 	
-	if( swf_exportSWF.GetBool() )
+	if( postLoadExportFlashToSWF.GetBool() )
 	{
 		idStr swfFileName = "exported/";
 		swfFileName += filename;