Skip to content

Commit 4d6886d

Browse files
committed
optional for mapdata
Replace assign with optional, it has better support for JSON features.
1 parent a5e5a13 commit 4d6886d

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/mapdata.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <unordered_map>
99
#include <utility>
1010

11-
#include "assign.h"
1211
#include "avatar.h"
1312
#include "calendar.h"
1413
#include "character.h"
@@ -514,9 +513,9 @@ bool furn_workbench_info::load( const JsonObject &jsobj, std::string_view member
514513
{
515514
JsonObject j = jsobj.get_object( member );
516515

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() );
520519

521520
return true;
522521
}
@@ -528,10 +527,10 @@ bool plant_data::load( const JsonObject &jsobj, std::string_view member )
528527
{
529528
JsonObject j = jsobj.get_object( member );
530529

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 );
535534

536535
return true;
537536
}
@@ -1196,7 +1195,7 @@ void ter_t::load( const JsonObject &jo, const std::string &src )
11961195
{
11971196
map_data_common_t::load( jo, src );
11981197
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 );
12001199
optional( jo, was_loaded, "trap", trap_id_str );
12011200
optional( jo, was_loaded, "heat_radiation", heat_radiation );
12021201

0 commit comments

Comments
 (0)