8
8
#include < unordered_map>
9
9
#include < utility>
10
10
11
- #include " assign.h"
12
11
#include " avatar.h"
13
12
#include " calendar.h"
14
13
#include " character.h"
@@ -514,9 +513,9 @@ bool furn_workbench_info::load( const JsonObject &jsobj, std::string_view member
514
513
{
515
514
JsonObject j = jsobj.get_object ( member );
516
515
517
- assign ( j, " multiplier" , multiplier );
518
- assign ( j, " mass" , allowed_mass );
519
- assign ( j, " volume" , allowed_volume );
516
+ optional ( j, false , " multiplier" , multiplier, 1 . 0f );
517
+ optional ( j, false , " mass" , allowed_mass, units::mass::max () );
518
+ optional ( j, false , " volume" , allowed_volume, units::volume::max () );
520
519
521
520
return true ;
522
521
}
@@ -528,10 +527,10 @@ bool plant_data::load( const JsonObject &jsobj, std::string_view member )
528
527
{
529
528
JsonObject j = jsobj.get_object ( member );
530
529
531
- assign ( j, " transform" , transform );
532
- assign ( j, " base" , base );
533
- assign ( j, " growth_multiplier" , growth_multiplier );
534
- assign ( j, " harvest_multiplier" , harvest_multiplier );
530
+ optional ( j, false , " transform" , transform, furn_str_id::NULL_ID () );
531
+ optional ( j, false , " base" , base, furn_str_id::NULL_ID () );
532
+ optional ( j, false , " growth_multiplier" , growth_multiplier, 1 . 0f );
533
+ optional ( j, false , " harvest_multiplier" , harvest_multiplier, 1 . 0f );
535
534
536
535
return true ;
537
536
}
@@ -1196,7 +1195,7 @@ void ter_t::load( const JsonObject &jo, const std::string &src )
1196
1195
{
1197
1196
map_data_common_t::load ( jo, src );
1198
1197
optional ( jo, was_loaded, " move_cost" , movecost );
1199
- assign ( jo, " max_volume" , max_volume, src == " dda " );
1198
+ optional ( jo, was_loaded, " max_volume" , max_volume, DEFAULT_TILE_VOLUME );
1200
1199
optional ( jo, was_loaded, " trap" , trap_id_str );
1201
1200
optional ( jo, was_loaded, " heat_radiation" , heat_radiation );
1202
1201
0 commit comments