id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-22 09:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed Flash GUI development cvars to postLoadFlash*

Browse source
This commit is contained in:
Robert Beckebans 2016-07-03 15:33:01 +02:00
parent e6f75d3336
commit 9a340f3914
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp
View file

@ -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;
}

8
neo/renderer/tr_frontend_addlights.cpp
View file

@ -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

14
neo/swf/SWF_Main.cpp
View file

@ -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;