Typos and make legacy read silent

CleverRaven · Jun 12, 2024 · 535d3c0 · 535d3c0
1 parent 8e071e1
commit 535d3c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/doc/OBSOLETION_AND_MIGRATION.md b/doc/OBSOLETION_AND_MIGRATION.md
@@ -162,7 +162,7 @@ Move multiple ids that don't need to be unique any more to a single id
 
 # Field migration
 
-Field migration replaces the provided id as submaps are loaded. You can use `fd_null` with `to_field` to remove furniture entirely without creating errors.
+Field migration replaces the provided id as submaps are loaded. You can use `fd_null` with `to_field` to remove the field entirely without creating errors.
 
 ```json
 {
@@ -172,7 +172,7 @@ Field migration replaces the provided id as submaps are loaded. You can use `fd_
 },
 ```
 
-## Example
+## Examples
 
 Migrate an id
 

diff --git a/src/init.cpp b/src/init.cpp
@@ -828,7 +828,7 @@ void DynamicDataLoader::check_consistency( loading_ui &ui )
             },
             { _( "Monster groups" ), &MonsterGroupManager::check_group_definitions },
             { _( "Furniture and terrain" ), &check_furniture_and_terrain },
-            { _( "Furniture amd terrain migrations" ), &ter_furn_migrations::check },
+            { _( "Furniture and terrain migrations" ), &ter_furn_migrations::check },
             { _( "Constructions" ), &check_constructions },
             { _( "Crafting recipes" ), &recipe_dictionary::check_consistency },
             { _( "Professions" ), &profession::check_definitions },

diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp
@@ -5046,10 +5046,9 @@ void submap::load( const JsonValue &jv, const std::string &member_name, int vers
                                m->fld[i][j].add_field( ft.id(), intensity, time_duration::from_turns( age ) ) ) {
                         field_count++;
                     }
-                } else {
-                    field_json.throw_error( "field type relying on ancient legacy int method" );
-                    field_json.next_value(); // skip intensity
-                    field_json.next_value(); // skip age
+                } else { // Handle removed int enum method
+                    field_json.next_value(); // Skip intensity
+                    field_json.next_value(); // Skip age
                 }
             }
         }