Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
351:5f36449527c6 352:ec6cc5cefa4b
3745 _this->field_4_expire_minute = v2 / 60 % 60; 3745 _this->field_4_expire_minute = v2 / 60 % 60;
3746 _this->field_8_expire_hour = v3 % 24; 3746 _this->field_8_expire_hour = v3 % 24;
3747 _this->field_10_expire_week = v5 / 7 & 3; 3747 _this->field_10_expire_week = v5 / 7 & 3;
3748 _this->field_C_expire_day = (unsigned int)v5 % 0x1C; 3748 _this->field_C_expire_day = (unsigned int)v5 % 0x1C;
3749 _this->field_14_exprie_month = v6 % 0xC; 3749 _this->field_14_exprie_month = v6 % 0xC;
3750 _this->field_18_expire_year = v6 / 0xC + 1168; 3750 _this->field_18_expire_year = v6 / 0xC + game_starting_year;
3751 } 3751 }
3752 3752
3753 3753
3754 3754
3755 3755
3838 pParty->uCurrentMinute = v1 % 60; 3838 pParty->uCurrentMinute = v1 % 60;
3839 pParty->uCurrentMonthWeek = v3 / 7 & 3; 3839 pParty->uCurrentMonthWeek = v3 / 7 & 3;
3840 pParty->uCurrentHour = v2 % 24; 3840 pParty->uCurrentHour = v2 % 24;
3841 pParty->uDaysPlayed = (unsigned int)v3 % 28; 3841 pParty->uDaysPlayed = (unsigned int)v3 % 28;
3842 pParty->uCurrentMonth = v4 % 12; 3842 pParty->uCurrentMonth = v4 % 12;
3843 pParty->uCurrentYear = v4 / 0xC + 1168; 3843 pParty->uCurrentYear = v4 / 0xC + game_starting_year;
3844 if ( pParty->uCurrentHour >= 3 && ((signed int)a2 < 3 || (unsigned int)v3 % 28 > v61) ) 3844 if ( pParty->uCurrentHour >= 3 && ((signed int)a2 < 3 || (unsigned int)v3 % 28 > v61) )
3845 { 3845 {
3846 pParty->pHirelings[0].bHasUsedTheAbility = false; 3846 pParty->pHirelings[0].bHasUsedTheAbility = false;
3847 pParty->pHirelings[1].bHasUsedTheAbility = false; 3847 pParty->pHirelings[1].bHasUsedTheAbility = false;
3848 3848
9153 pParty->uCurrentMinute = v1 / 60 % 60; 9153 pParty->uCurrentMinute = v1 / 60 % 60;
9154 pParty->uCurrentHour = v3 % 24; 9154 pParty->uCurrentHour = v3 % 24;
9155 pParty->uCurrentMonthWeek = v4 / 7 & 3; 9155 pParty->uCurrentMonthWeek = v4 / 7 & 3;
9156 pParty->uDaysPlayed = (unsigned int)v4 % 0x1C; 9156 pParty->uDaysPlayed = (unsigned int)v4 % 0x1C;
9157 pParty->uCurrentMonth = v5 % 0xC; 9157 pParty->uCurrentMonth = v5 % 0xC;
9158 pParty->uCurrentYear = v5 / 0xC + 1168; 9158 pParty->uCurrentYear = v5 / 0xC + game_starting_year;
9159 pParty->RestAndHeal(); 9159 pParty->RestAndHeal();
9160 dword_507B94 = 1; 9160 dword_507B94 = 1;
9161 v6 = pParty->pPlayers;//[0].uNumDivineInterventionCastsThisDay; 9161 v6 = pParty->pPlayers;//[0].uNumDivineInterventionCastsThisDay;
9162 do 9162 do
9163 { 9163 {