Appease our clang overlords

CleverRaven · Nov 2, 2024 · 9e5adce · 9e5adce
1 parent 61e48e8
commit 9e5adce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/src/gamemode_tutorial.cpp b/src/gamemode_tutorial.cpp
@@ -50,21 +50,8 @@ static const ter_str_id ter_t_water_dispenser( "t_water_dispenser" );
 static const ter_str_id ter_t_window( "t_window" );
 
 static const trap_str_id tr_bubblewrap( "tr_bubblewrap" );
-static const trap_str_id tr_tutorial_1( "tr_tutorial_1" );
-static const trap_str_id tr_tutorial_10( "tr_tutorial_10" );
 static const trap_str_id tr_tutorial_11( "tr_tutorial_11" );
-static const trap_str_id tr_tutorial_12( "tr_tutorial_12" );
 static const trap_str_id tr_tutorial_13( "tr_tutorial_13" );
-static const trap_str_id tr_tutorial_14( "tr_tutorial_14" );
-static const trap_str_id tr_tutorial_15( "tr_tutorial_15" );
-static const trap_str_id tr_tutorial_2( "tr_tutorial_2" );
-static const trap_str_id tr_tutorial_3( "tr_tutorial_3" );
-static const trap_str_id tr_tutorial_4( "tr_tutorial_4" );
-static const trap_str_id tr_tutorial_5( "tr_tutorial_5" );
-static const trap_str_id tr_tutorial_6( "tr_tutorial_6" );
-static const trap_str_id tr_tutorial_7( "tr_tutorial_7" );
-static const trap_str_id tr_tutorial_8( "tr_tutorial_8" );
-static const trap_str_id tr_tutorial_9( "tr_tutorial_9" );
 
 namespace io
 {

diff --git a/src/main_menu.cpp b/src/main_menu.cpp
@@ -114,7 +114,7 @@ void demo_ui::run()
 }
 
 static const mod_id MOD_INFORMATION_dda( "dda" );
-static const mod_id MOD_INFORMATION_tutorial( "dda_tutorial" );
+static const mod_id MOD_INFORMATION_dda_tutorial( "dda_tutorial" );
 
 enum class main_menu_opts : int {
     MOTD = 0,
@@ -892,7 +892,7 @@ bool main_menu::opening_screen()
                         }
                         world->active_mod_order.clear();
                         world->active_mod_order.emplace_back( MOD_INFORMATION_dda );
-                        world->active_mod_order.emplace_back( MOD_INFORMATION_tutorial );
+                        world->active_mod_order.emplace_back( MOD_INFORMATION_dda_tutorial );
                         world_generator->set_active_world( world );
                         try {
                             g->setup();

diff --git a/src/output.h b/src/output.h
@@ -503,7 +503,7 @@ enum PopupFlags {
     PF_FULLSCREEN  = 1 << 3,
 };
 
-PopupFlags popup_flag_from_string( const std::string str );
+PopupFlags popup_flag_from_string( const std::string &str );
 
 template<typename ...Args>
 inline int popup_getkey( const char *const mes, Args &&... args )