Fix astyle preventing compilation on linux

Fixed condition.h and options.cpp conflicting with astyle
klliio · Jan 14, 2024 · a128be2 · a128be2
1 parent 0ce1c5d
commit a128be2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/condition.h b/src/condition.h
@@ -130,7 +130,8 @@ struct conditional_t {
         void set_is_on_terrain_with_flag( const JsonObject &jo, const std::string &member,
                                           bool is_npc = false );
         void set_is_in_field( const JsonObject &jo, const std::string &member, bool is_npc = false );
-        void set_has_wielded_with_weapon_category( const JsonObject &jo, const std::string &member, bool is_npc = false );
+        void set_has_wielded_with_weapon_category( const JsonObject &jo, const std::string &member,
+                bool is_npc = false );
         void set_one_in_chance( const JsonObject &jo, const std::string &member );
         void set_query( const JsonObject &jo, const std::string &member, bool is_npc = false );
         void set_x_in_y_chance( const JsonObject &jo, std::string_view member );

diff --git a/src/options.cpp b/src/options.cpp
@@ -3041,7 +3041,7 @@ void options_manager::add_options_world_default()
          to_translation( "Multiplier for experience gained from practicing skills and reading books.  0.5 is half as fast as default, 2 is twice as fast, 0 disables skill training except for NPC training.  Higher value makes characters train skills faster." ),
          0.00f, 100.00f, 1.00f, 0.01f
        );
-    
+
     add( "PROFICIENCY_TRAINING_SPEED", "world_default", to_translation( "Proficiency training speed" ),
          to_translation( "Scales experience gained from practicing proficiencies.  0.5 is half as fast as default, 2.0 is twice as fast, 0.0 disables proficiency training except for NPC training." ),
          0.0, 100.0, 1.0, 0.1