Merge pull request #1847 from ineveraskedforthis/economy-tweaking

sanitise usage of global_immigrant_attract
schombert · Jan 7, 2025 · c282a7a · c282a7a
2 parents 39294cd + c3d4f9f
commit c282a7a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/economy/demographics.cpp b/src/economy/demographics.cpp
@@ -3416,10 +3416,10 @@ dcon::nation_id get_immigration_target(sys::state& state, dcon::nation_id owner,
 			float interp_result = trigger::evaluate_multiplicative_modifier(state, modifier, trigger::to_generic(inner), trigger::to_generic(p), 0);
 			assert( llvm_result == interp_result);
 #endif
-			weight = std::max(0.0f, llvm_result *  (state.world.nation_get_modifier_values(inner, sys::national_mod_offsets::global_immigrant_attract) + 1.0f));
+			weight = std::max(0.0f, llvm_result * std::max(0.f, (state.world.nation_get_modifier_values(inner, sys::national_mod_offsets::global_immigrant_attract) + 1.0f)));
 		} else {
 			float interp_result = trigger::evaluate_multiplicative_modifier(state, modifier, trigger::to_generic(inner), trigger::to_generic(p), 0);
-			weight = std::max(0.0f, interp_result *  (state.world.nation_get_modifier_values(inner, sys::national_mod_offsets::global_immigrant_attract) + 1.0f));
+			weight = std::max(0.0f, interp_result * std::max(0.f, (state.world.nation_get_modifier_values(inner, sys::national_mod_offsets::global_immigrant_attract) + 1.0f)));
 		}
 
 		if(weight > top_weights[2]) {