Mercurial > mm7

comparison mm7_1.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 4a236657a0be
comparison
equal deleted inserted replaced
351:5f36449527c6 352:ec6cc5cefa4b
2658 { 2658 {
2659 if ( _this->uAttributes & 8 && (_this->uAdditionalValue || _this->_bonus_type) ) 2659 if ( _this->uAttributes & 8 && (_this->uAdditionalValue || _this->_bonus_type) )
2660 { 2660 {
2661 sub_493F79(&v67, _this->uExpireTime - pParty->uTimePlayed); 2661 sub_493F79(&v67, _this->uExpireTime - pParty->uTimePlayed);
2662 strcpy(pTmpBuf, "Duration:"); 2662 strcpy(pTmpBuf, "Duration:");
2663 Str = (char *)(v67.field_18_expire_year - 1168); 2663 Str = (char *)(v67.field_18_expire_year - game_starting_year);
2664 if (v67.field_18_expire_year != 1168 ) 2664 if (v67.field_18_expire_year != 1168 )
2665 { 2665 {
2666 sprintf(v65, " %d:yr", v67.field_18_expire_year - 1168); 2666 sprintf(v65, " %d:yr", v67.field_18_expire_year - game_starting_year);
2667 strcat(pTmpBuf, v65); 2667 strcat(pTmpBuf, v65);
2668 } 2668 }
2669 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) 2669 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)
2670 && ((sprintf(v65, " %d:dy", v67.field_C_expire_day), strcat(pTmpBuf, v65), v67.field_14_exprie_month) || Str || v67.field_C_expire_day) 2670 && ((sprintf(v65, " %d:dy", v67.field_C_expire_day), strcat(pTmpBuf, v65), v67.field_14_exprie_month) || Str || v67.field_C_expire_day)
2671 || v67.field_8_expire_hour) 2671 || v67.field_8_expire_hour)