Actually respect default world compression setting (#82425)

Author: akrieger

src/options.cpp

@@ -1770,6 +1770,13 @@ void options_manager::add_options_general()
 
         get_option( "AMBIENT_SOUND_VOLUME" ).setPrerequisite( "SOUND_ENABLED" );
     } );
+
+    add_empty_line();
+
+    add( "WORLD_COMPRESSION2", "general", to_translation( "World data compression" ),
+         to_translation( "If true, new worlds store data in a compressed format." ),
+         true
+       );
 }
 
 void options_manager::add_options_interface()
@@ -2753,11 +2760,6 @@ void options_manager::add_options_world_default()
     }, "reset"
        );
 
-    add( "WORLD_COMPRESSION", "world_default", to_translation( "World data compression" ),
-         to_translation( "If true, new worlds store data in a compressed format." ),
-         false
-       );
-
     add_empty_line();
 
     // These optiosn are purposefully and permanently hidden. It can only be modified through the sliders when creating a new world.

src/worldfactory.cpp

@@ -139,6 +139,18 @@ WORLD *worldfactory::add_world( std::unique_ptr<WORLD> retworld )
     if( !retworld->save() ) {
         return nullptr;
     }
+    if( get_option<bool>( "WORLD_COMPRESSION2" ) ) {
+        cata_path dictionary_folder = PATH_INFO::compression_folder_path();
+        cata_path maps_dict = dictionary_folder / "maps.dict";
+        cata_path mmr_dict = dictionary_folder / "mmr.dict";
+        cata_path overmaps_dict = dictionary_folder / "overmaps.dict";
+
+        if( !copy_file( maps_dict, retworld->folder_path() / "maps.dict" ) ||
+            !copy_file( mmr_dict, retworld->folder_path() / "mmr.dict" ) ||
+            !copy_file( overmaps_dict, retworld->folder_path() / "overmaps.dict" ) ) {
+            return nullptr;
+        }
+    }
     return ( all_worlds[ retworld->world_name ] = std::move( retworld ) ).get();
 }