From 49f52891fe93fff4c490e404f88af6d68a184c76 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sat, 3 Sep 2022 18:12:29 -0700 Subject: [PATCH] Use a switch in HighestEstrus --- .../HediffComps/MenstruationUtility.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs index c758ea5..6864251 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs @@ -338,9 +338,16 @@ namespace RJW_Menstruation foreach(HediffComp_Menstruation comp in pawn.GetMenstruationComps()) { - HediffComp_Menstruation.EstrusLevel current = comp.GetEstrusLevel(); - if (current == HediffComp_Menstruation.EstrusLevel.Visible) return HediffComp_Menstruation.EstrusLevel.Visible; - else if (current == HediffComp_Menstruation.EstrusLevel.Concealed) res = HediffComp_Menstruation.EstrusLevel.Concealed; + switch (comp.GetEstrusLevel()) + { + case HediffComp_Menstruation.EstrusLevel.None: + break; + case HediffComp_Menstruation.EstrusLevel.Concealed: + res = HediffComp_Menstruation.EstrusLevel.Concealed; + break; + case HediffComp_Menstruation.EstrusLevel.Visible: + return HediffComp_Menstruation.EstrusLevel.Visible; + } } return res;