From 55edd99c3eb7a471b33cfee36f7102d38679a728 Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Sat, 17 Sep 2016 21:12:35 +0200 Subject: [PATCH] attempt to fix wrong recruitlist in UtBS 1 --- src/game_initialization/flg_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game_initialization/flg_manager.cpp b/src/game_initialization/flg_manager.cpp index cb943f6ffb1..708cb4184e0 100644 --- a/src/game_initialization/flg_manager.cpp +++ b/src/game_initialization/flg_manager.cpp @@ -51,8 +51,8 @@ flg_manager::flg_manager(const std::vector& era_factions, use_map_settings_(use_map_settings), saved_game_(saved_game), has_no_recruits_(get_original_recruits(side_).empty() && side_["previous_recruits"].empty()), - faction_lock_(side_["faction_lock"].to_bool(lock_settings) && use_map_settings), - leader_lock_(side_["leader_lock"].to_bool(lock_settings) && use_map_settings), + faction_lock_(side_["faction_lock"].to_bool(lock_settings) && (use_map_settings || lock_settings)), + leader_lock_(side_["leader_lock"].to_bool(lock_settings) && (use_map_settings || lock_settings)), available_factions_(), available_leaders_(), available_genders_(),