Less very unlikely error messages

CleverRaven · Apr 3, 2024 · ca1f71f · ca1f71f
1 parent fdc07b5
commit ca1f71f
Showing 1 changed file with 17 additions and 31 deletions.
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
@@ -4489,22 +4489,16 @@ bool mapgen_function_json_base::setup_common( const JsonObject &jo )
         row_keys.reserve( total_size.x );
         utf8_display_split_into( row, row_keys );
         if( row_keys.size() < static_cast<size_t>( expected_dim.x ) ) {
-            if( !default_rows ) {
-                parray.throw_error(
-                    string_format( "format: row %d must have at least %d columns, not %d",
-                                   c + 1, expected_dim.x, row_keys.size() ) );
-            } else {
-                jo.throw_error( "Defaulted rows row somehow has the wrong size!" );
-            }
+            cata_assert( !default_rows );
+            parray.throw_error(
+                string_format( "format: row %d must have at least %d columns, not %d",
+                               c + 1, expected_dim.x, row_keys.size() ) );
         }
         if( row_keys.size() != static_cast<size_t>( total_size.x ) ) {
-            if( !default_rows ) {
-                parray.throw_error(
-                    string_format( "format: row %d must have %d columns, not %d; check mapgensize if applicable",
-                                   c + 1, total_size.x, row_keys.size() ) );
-            } else {
-                jo.throw_error( "Defaulted rows somehow used the wrong number of rows!" );
-            }
+            cata_assert( !default_rows );
+            parray.throw_error(
+                string_format( "format: row %d must have %d columns, not %d; check mapgensize if applicable",
+                               c + 1, total_size.x, row_keys.size() ) );
         }
         for( int i = m_offset.x; i < expected_dim.x; i++ ) {
             const point p = point( i, c ) - m_offset;
@@ -4516,26 +4510,18 @@ bool mapgen_function_json_base::setup_common( const JsonObject &jo )
             const bool has_placing = fpi != format_placings.end();
 
             if( !has_terrain && !fallback_terrain_exists ) {
-                if( !default_rows ) {
-                    parray.string_error(
-                        c, i + 1,
-                        string_format( "format: rows: row %d column %d: '%s' is not in 'terrain',"
-                                       "and no 'fill_ter', 'predecessor_mapgen' or 'fallback_predecessor_mapgen' is set!",
-                                       c + 1, i + 1, key.str ) );
-                } else {
-                    jo.throw_error( "format: ' ' is not in 'terrain', and no 'fill_ter', 'predecessor_mapgen' or 'fallback_predecessor_mapgen' is set!" );
-                }
+                cata_assert( !default_rows );
+                parray.string_error( c, i + 1,
+                                     string_format( "format: rows: row %d column %d: '%s' is not in 'terrain',"
+                                                    "and no 'fill_ter', 'predecessor_mapgen' or 'fallback_predecessor_mapgen' is set!",
+                                                    c + 1, i + 1, key.str ) );
             }
             if( !has_terrain && !has_placing && key.str != " " && key.str != "." ) {
                 try {
-                    if( !default_rows ) {
-                        parray.string_error(
-                            c, i + 1,
-                            string_format( "format: rows: row %d column %d: '%s' has no terrain, furniture, or other definition",
-                                           c + 1, i + 1, key.str ) );
-                    } else {
-                        jo.throw_error( "Defaulted rows somehow has a non ' ' character!" );
-                    }
+                    cata_assert( !default_rows );
+                    parray.string_error( c, i + 1,
+                                         string_format( "format: rows: row %d column %d: '%s' has no terrain, furniture, or other definition",
+                                                        c + 1, i + 1, key.str ) );
                 } catch( const JsonError &e ) {
                     debugmsg( "(json-error)\n%s", e.what() );
                 }