rename death_screen to end_screen

src/end_screen.cpp

@@ -0,0 +1,38 @@
+#include "assign.h"
+#include "condition.h"
+#include "death_screen.h"
+#include "generic_factory.h"
+
+namespace
+{
+generic_factory<end_screen> end_screen_factory( "end_screen" );
+} // namespace
+
+template<>
+const end_screen &string_id<end_screen>::obj()const
+{
+    return end_screen_factory.obj( *this );
+}
+
+template<>
+bool string_id<end_screen>::is_valid() const
+{
+    return end_screen_factory.is_valid( *this );
+}
+
+void end_screen::load_death_screen( const JsonObject &jo, const std::string &src )
+{
+    end_screen_factory.load( jo, src );
+}
+
+void end_screen::load( const JsonObject &jo, std::string_view )
+{
+    mandatory( jo, was_loaded, "id", id );
+    mandatory( jo, was_loaded, "picture_id", picture_id );
+    read_condition( jo, "condition", condition, false );
+}
+
+const std::vector<end_screen> &end_screen::get_all()
+{
+    return end_screen_factory.get_all();
+}

src/death_screen.h → src/end_screen.h

@@ -11,16 +11,16 @@
 
 class JsonObject;
 
-class death_screen
+class end_screen
 {
     public:
         static void load_death_screen( const JsonObject &jo, const std::string &src );
 
         void load( const JsonObject &jo, std::string_view );
-        static const std::vector<death_screen>& get_all();
+        static const std::vector<end_screen>& get_all();
         bool was_loaded = false;
 
-        death_screen_id id;
+        end_screen_id id;
         ascii_art_id picture_id;
         std::function<bool( dialogue & )> condition;
 };

src/init.cpp

@@ -299,7 +299,7 @@ void DynamicDataLoader::initialize()
     add( "scent_type", &scent_type::load_scent_type );
     add( "disease_type", &disease_type::load_disease_type );
     add( "ascii_art", &ascii_art::load_ascii_art );
-    add( "death_screen", &death_screen::load_death_screen );
+    add( "end_screen", &end_screen::load_death_screen );
 
     // json/colors.json would be listed here, but it's loaded before the others (see init_colors())
     // Non Static Function Access

src/type_id.h

@@ -79,9 +79,6 @@ using damage_type_id = string_id<damage_type>;
 struct damage_info_order;
 using damage_info_order_id = string_id<damage_info_order>;
 
-struct death_screen;
-using death_screen_id = string_id<death_screen>;
-
 class disease_type;
 using diseasetype_id = string_id<disease_type>;
 
@@ -91,6 +88,9 @@ using emit_id = string_id<emit>;
 class enchantment;
 using enchantment_id = string_id<enchantment>;
 
+struct end_screen;
+using end_screen_id = string_id<end_screen>;
+
 class event_statistic;
 using event_statistic_id = string_id<event_statistic>;