Merge pull request #40253 from RedShakespeare/music_instrument

Add previously missing json-loading of desc_freq in music instruments
CleverRaven · May 8, 2020 · 1786e61 · 1786e61
2 parents 77b1f5f + 83c8dfb
commit 1786e61
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp
@@ -2216,6 +2216,7 @@ void musical_instrument_actor::load( const JsonObject &obj )
     volume = obj.get_int( "volume" );
     fun = obj.get_int( "fun" );
     fun_bonus = obj.get_int( "fun_bonus", 0 );
+    description_frequency = time_duration::from_turns( obj.get_int( "description_frequency", 0 ) );
     if( !obj.read( "description_frequency", description_frequency ) ) {
         obj.throw_error( "missing member \"description_frequency\"" );
     }