Mercurial > mm7

changeset 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 95be2dcecadf
files Player.cpp mm7_1.cpp mm7_2.cpp mm7_4.cpp
diffstat 4 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Player.cpp	Thu Feb 21 03:04:08 2013 +0200
+++ b/Player.cpp	Thu Feb 21 03:06:13 2013 +0200
@@ -4411,8 +4411,7 @@
 //----- (0048E6DC) --------------------------------------------------------
 unsigned int Player::GetBaseAge()
 {
-  return ((__int64)(pParty->uTimePlayed * 0.234375) / 60 / 60 / 24) / 7 / 4 / 12
-       - uBirthYear + 1168;
+  return ((__int64)(pParty->uTimePlayed * 0.234375) / 60 / 60 / 24) / 7 / 4 / 12 - uBirthYear + game_starting_year;
 }
 
 //----- (0048E72C) --------------------------------------------------------
--- a/mm7_1.cpp	Thu Feb 21 03:04:08 2013 +0200
+++ b/mm7_1.cpp	Thu Feb 21 03:06:13 2013 +0200
@@ -2660,10 +2660,10 @@
         {
           sub_493F79(&v67, _this->uExpireTime - pParty->uTimePlayed);
           strcpy(pTmpBuf, "Duration:");
-          Str = (char *)(v67.field_18_expire_year - 1168);
+          Str = (char *)(v67.field_18_expire_year - game_starting_year);
           if (v67.field_18_expire_year != 1168 )
           {
-            sprintf(v65, " %d:yr", v67.field_18_expire_year - 1168);
+            sprintf(v65, " %d:yr", v67.field_18_expire_year - game_starting_year);
             strcat(pTmpBuf, v65);
           }
           if ( (((v67.field_14_exprie_month || Str) && ((sprintf(v65, " %d:mo", v67.field_14_exprie_month), strcat(pTmpBuf, v65), v67.field_14_exprie_month) || Str) || v67.field_C_expire_day)
--- a/mm7_2.cpp	Thu Feb 21 03:04:08 2013 +0200
+++ b/mm7_2.cpp	Thu Feb 21 03:06:13 2013 +0200
@@ -10995,7 +10995,7 @@
     v14 = (unsigned __int64)(pAMPM2 % 24) >> 32;
     LODWORD(pAMPM2) = pAMPM2 % 24;
     HIDWORD(pOurHour) = pSaveFiles % 28;
-    pYear += 1168;//год начала
+    pYear += game_starting_year;
     v16 = v12 & 3;
     pWindow.uFrameY = pGUIWindow_CurrentMenu->uFrameY + 261;
     HIDWORD(pAMPM2) = v14 == 0 && ((signed int)v14 > 0 || (unsigned int)pOurHour >= 12)
--- 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;