Merge pull request #76220 from andrei8l/overmap-no-default-adapter

overmap: don't initialize redundant ui_adaptor by default
CleverRaven · Sep 6, 2024 · faa10bf · faa10bf
2 parents 1a13be3 + 68f6d1d
commit faa10bf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/overmap_ui.cpp b/src/overmap_ui.cpp
@@ -1195,10 +1195,8 @@ tiles_redraw_info redraw_info;
 
 static void draw( overmap_draw_data_t &data )
 {
+    cata_assert( static_cast<bool>( data.ui ) );
     ui_adaptor *ui = data.ui.get();
-    if( ui == nullptr ) {
-        return;
-    }
     draw_om_sidebar( *ui, g->w_omlegend, data.ictxt, data );
 #if defined( TILES )
     if( use_tiles && use_tiles_overmap ) {

diff --git a/src/overmap_ui.h b/src/overmap_ui.h
@@ -124,7 +124,6 @@ struct overmap_draw_data_t {
     input_context ictxt;
 
     overmap_draw_data_t() {
-        ui = std::make_shared<ui_adaptor>();
         ictxt = input_context( "OVERMAP" );
     }
 };