Mercurial > mm7

diff mm7_4.cpp @ 352:ec6cc5cefa4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Game starting age (1168) moved to a variable
author Nomad
date Thu, 21 Feb 2013 03:06:13 +0200
parents 5f36449527c6
children bbf8efb5bfee
line wrap: on
line diff
--- a/mm7_4.cpp	Thu Feb 21 03:04:08 2013 +0200
+++ b/mm7_4.cpp	Thu Feb 21 03:06:13 2013 +0200
@@ -3747,7 +3747,7 @@
   _this->field_10_expire_week = v5 / 7 & 3;
   _this->field_C_expire_day = (unsigned int)v5 % 0x1C;
   _this->field_14_exprie_month = v6 % 0xC;
-  _this->field_18_expire_year = v6 / 0xC + 1168;
+  _this->field_18_expire_year = v6 / 0xC + game_starting_year;
 }
 
 
@@ -3840,7 +3840,7 @@
   pParty->uCurrentHour = v2 % 24;
   pParty->uDaysPlayed = (unsigned int)v3 % 28;
   pParty->uCurrentMonth = v4 % 12;
-  pParty->uCurrentYear = v4 / 0xC + 1168;
+  pParty->uCurrentYear = v4 / 0xC + game_starting_year;
   if ( pParty->uCurrentHour >= 3 && ((signed int)a2 < 3 || (unsigned int)v3 % 28 > v61) )
   {
     pParty->pHirelings[0].bHasUsedTheAbility = false;
@@ -9155,7 +9155,7 @@
   pParty->uCurrentMonthWeek = v4 / 7 & 3;
   pParty->uDaysPlayed = (unsigned int)v4 % 0x1C;
   pParty->uCurrentMonth = v5 % 0xC;
-  pParty->uCurrentYear = v5 / 0xC + 1168;
+  pParty->uCurrentYear = v5 / 0xC + game_starting_year;
   pParty->RestAndHeal();
   dword_507B94 = 1;
   v6 = pParty->pPlayers;//[0].uNumDivineInterventionCastsThisDay;