From 504e7f55918c1c806858dfdb0df8305de7bcb500 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Fri, 28 Jun 2024 13:45:07 +0200 Subject: [PATCH] Made classic flashlight single player only --- neo/d3xp/Player.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neo/d3xp/Player.cpp b/neo/d3xp/Player.cpp index 3f57d708..e066fa36 100644 --- a/neo/d3xp/Player.cpp +++ b/neo/d3xp/Player.cpp @@ -5961,7 +5961,7 @@ void idPlayer::UpdateWeapon() // RB bool idPlayer::UsesClassicFlashlight() { - return ( ng_classicFlashlight.GetBool() || fileSystem->IsDoom2004() ); + return ( ( ng_classicFlashlight.GetBool() || fileSystem->IsDoom2004() ) && !common->IsMultiplayer() ); } /* diff --git a/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp b/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp index c3d9e248..dc72c555 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp @@ -120,7 +120,7 @@ void idMenuScreen_Shell_GameOptions::Initialize( idMenuHandler* data ) control = new( TAG_SWF ) idMenuWidget_ControlButton(); control->SetOptionType( OPTION_SLIDER_TOGGLE ); - control->SetLabel( "Classic Flashlight" ); + control->SetLabel( "Classic Flashlight (SP)" ); control->SetDataSource( &systemData, idMenuDataSource_GameSettings::GAME_FIELD_CLASSIC_FLASHLIGHT ); control->SetupEvents( DEFAULT_REPEAT_TIME, options->GetChildren().Num() ); control->AddEventAction( WIDGET_EVENT_PRESS ).Set( WIDGET_ACTION_PRESS_FOCUSED, options->GetChildren().Num() );