Mercurial > mm7

diff Player.cpp @ 1350:8baf20c8f805

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::GetTempleHealCostModifier simplified
author Grumpy7
date Sat, 13 Jul 2013 01:44:53 +0200
parents e721754db8ee
children f1209ed77782
line wrap: on
line diff
--- a/Player.cpp	Sat Jul 13 01:30:40 2013 +0200
+++ b/Player.cpp	Sat Jul 13 01:44:53 2013 +0200
@@ -283,22 +283,19 @@
     }
     conditionTimeMultiplier = GetConditionDayOfWeek(conditionIdx);
   }
-  else if (conditionIdx < 14)
-  {
-    baseConditionMultiplier = 1;
-    conditionTimeMultiplier = 0;
-    for (int i = 0; i <= 13; i++)
-    {
-      v6 = GetConditionDayOfWeek(i);
-      if ( v6 > conditionTimeMultiplier )
-        conditionTimeMultiplier = v6;
-    }
-    if ( !conditionTimeMultiplier )
-      conditionTimeMultiplier = 1;
-  }
-  else{
+  else 
+  {
     conditionTimeMultiplier = 1;
     baseConditionMultiplier = 1;
+    if (conditionIdx < 14)
+    {
+      for (int i = 0; i <= 13; i++)
+      {
+        v6 = GetConditionDayOfWeek(i);
+        if ( v6 > conditionTimeMultiplier )
+          conditionTimeMultiplier = v6;
+      }
+    }
   }
   result = (int)((double)conditionTimeMultiplier * (double)baseConditionMultiplier * a2);
   if ( result < 1 )