Skip to content

Commit 748997f

Browse files
authored
Merge pull request #82910 from ehughsbaird/missed-iuse-inits
Fix some missed iuse initializers.
1 parent 2bed65c commit 748997f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/iuse_actor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4023,7 +4023,7 @@ place_trap_actor::data::data() : trap( trap_str_id::NULL_ID() ) {}
40234023

40244024
void place_trap_actor::data::load( const JsonObject &obj )
40254025
{
4026-
optional( obj, false, "trap", trap );
4026+
optional( obj, false, "trap", trap, trap_str_id::NULL_ID() );
40274027
optional( obj, false, "done_message", done_message );
40284028
optional( obj, false, "practice", practice, 0 );
40294029
optional( obj, false, "moves", moves, 100 );
@@ -4034,13 +4034,13 @@ void place_trap_actor::load( const JsonObject &obj, const std::string & )
40344034
optional( obj, false, "allow_underwater", allow_underwater, false );
40354035
optional( obj, false, "allow_under_player", allow_under_player, false );
40364036
optional( obj, false, "needs_solid_neighbor", needs_solid_neighbor, false );
4037-
optional( obj, false, "needs_neighbor_terrain", needs_neighbor_terrain );
4037+
optional( obj, false, "needs_neighbor_terrain", needs_neighbor_terrain, ter_str_id::NULL_ID() );
40384038
optional( obj, false, "bury_question", bury_question );
40394039
if( !bury_question.empty() ) {
40404040
optional( obj, false, "bury", buried_data );
40414041
}
40424042
unburied_data.load( obj );
4043-
optional( obj, false, "outer_layer_trap", outer_layer_trap );
4043+
optional( obj, false, "outer_layer_trap", outer_layer_trap, trap_str_id::NULL_ID() );
40444044
}
40454045

40464046
std::unique_ptr<iuse_actor> place_trap_actor::clone() const

0 commit comments

Comments
 (0)