From b46eef7154d87dd17792a273a9c55a8007675755 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 9 Nov 2023 02:06:37 -0800 Subject: Porting to 0.4, part 2. --- revert-20_Fix-tidy-warnings-3310.patch | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'revert-20_Fix-tidy-warnings-3310.patch') diff --git a/revert-20_Fix-tidy-warnings-3310.patch b/revert-20_Fix-tidy-warnings-3310.patch index 944a1b7..e026533 100644 --- a/revert-20_Fix-tidy-warnings-3310.patch +++ b/revert-20_Fix-tidy-warnings-3310.patch @@ -4,22 +4,8 @@ Date: Sat, 30 Sep 2023 08:43:54 +0300 Subject: [PATCH] Fix tidy warnings (#3310) --- - src/bionics.cpp | 3 +-- src/suffer.cpp | 3 --- -diff --git a/src/bionics.cpp b/src/bionics.cpp -index 1884f75e6f8..a77ff42be5a 100644 ---- a/src/bionics.cpp -+++ b/src/bionics.cpp -@@ -200,7 +200,6 @@ static const std::string flag_PERSONAL( "PERSONAL" ); - static const std::string flag_SAFE_FUEL_OFF( "SAFE_FUEL_OFF" ); - static const std::string flag_SEALED( "SEALED" ); - static const std::string flag_SEMITANGIBLE( "SEMITANGIBLE" ); --static const std::string flag_SPLINT( "SPLINT" ); - - static const flag_str_id flag_BIONIC_FAULTY( "BIONIC_FAULTY" ); - static const flag_str_id flag_BIONIC_GUN( "BIONIC_GUN" ); - diff --git a/src/suffer.cpp b/src/suffer.cpp index 97786373598..390016d1aa5 100644 --- a/src/suffer.cpp @@ -38,13 +24,6 @@ index 97786373598..390016d1aa5 100644 static const efftype_id effect_feral_killed_recently( "feral_killed_recently" ); static const efftype_id effect_formication( "formication" ); static const efftype_id effect_glowy_led( "glowy_led" ); -@@ -169,7 +167,6 @@ static const mtype_id mon_zombie_soldier( "mon_zombie_soldier" ); - static const std::string flag_BLIND( "BLIND" ); - static const std::string flag_PLOWABLE( "PLOWABLE" ); - static const std::string flag_RAD_RESIST( "RAD_RESIST" ); --static const std::string flag_SPLINT( "SPLINT" ); - static const std::string flag_SUN_GLASSES( "SUN_GLASSES" ); - -- 2.42.0 -- cgit v1.2.1