Mercurial > mm7

diff mm7_2.cpp @ 630:1b813023fcbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tilesets change according to current season
author Nomad
date Mon, 11 Mar 2013 03:37:48 +0200
parents 574cc56e05e9
children 3d03a3a674bc
line wrap: on
line diff
--- a/mm7_2.cpp	Fri Mar 08 17:08:08 2013 +0200
+++ b/mm7_2.cpp	Mon Mar 11 03:37:48 2013 +0200
@@ -3293,6 +3293,7 @@
   if ( (signed __int64)__PAIR__(pParty->field_3C.field_0[2 * v0 + 1], pParty->field_3C.field_0[2 * v0]) < (signed __int64)pParty->uTimePlayed )
   {
     pParty->field_75A[v0] = 0;
+    __debugbreak(); // starting year-related constant here;
     v1 = (signed __int64)((double)(0x12750000 * (pParty->uCurrentMonth + 12i64 * pParty->uCurrentYear - 14015))
                         * 0.033333335);
     pParty->field_3C.field_0[2 * v0] = v1;
@@ -15921,15 +15922,11 @@
   }
   else
   {
-    if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
-    {
+    if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
       BLV_UpdateUserInputAndOther();
-    }
-    else
-    {
-      if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor )
+    else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
         ODM_UpdateUserInputAndOther();
-    }
+
     _438F8F_area_of_effect__damage_evaluate();
   }
 }