Mercurial > mm7

comparison mm7_4.cpp @ 1747:cecb080929c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Party_stru0 renamed to PartyTimeStruct, fixed its members, renamed Party::field_3C to Party::PartyTimes, started Player::SetVariable refactoring start
author Grumpy7
date Mon, 30 Sep 2013 05:48:32 +0200
parents 8251e59fd7c1
children 421c29d4ab3e
comparison
equal deleted inserted replaced
1738:ef86fc6d6a80 1747:cecb080929c4
2118 strcat(pTmpBuf2.data(), a4); 2118 strcat(pTmpBuf2.data(), a4);
2119 dst = strlen(pTmpBuf2.data()); 2119 dst = strlen(pTmpBuf2.data());
2120 i += 2; 2120 i += 2;
2121 break; 2121 break;
2122 } 2122 }
2123 init_summoned_item(&v56, pParty->field_3C._s_times[v17-51]); 2123 init_summoned_item(&v56, pParty->PartyTimes._s_times[v17-51]);
2124 sprintfex(a1, pGlobalTXT_LocalizationStrings[378], aMonthNames[v56.field_14_exprie_month], v56.field_C_expire_day + 1, v56.field_18_expire_year); 2124 sprintfex(a1, pGlobalTXT_LocalizationStrings[378], aMonthNames[v56.field_14_exprie_month], v56.field_C_expire_day + 1, v56.field_18_expire_year);
2125 strcat(pTmpBuf2.data(), a1); 2125 strcat(pTmpBuf2.data(), a1);
2126 dst = strlen(pTmpBuf2.data()); 2126 dst = strlen(pTmpBuf2.data());
2127 i += 2; 2127 i += 2;
2128 break; 2128 break;
2753 } 2753 }
2754 if ( v5 > 4000000 ) 2754 if ( v5 > 4000000 )
2755 pParty->uFine = 4000000; 2755 pParty->uFine = 4000000;
2756 } 2756 }
2757 2757
2758 pParty->field_3C._shop_ban_times[a1] = pParty->uTimePlayed + 368640; 2758 pParty->PartyTimes._shop_ban_times[a1] = pParty->uTimePlayed + 368640;
2759 2759
2760 LABEL_13: 2760 LABEL_13:
2761 pParty->InTheShopFlags[a1] = 1; 2761 pParty->InTheShopFlags[a1] = 1;
2762 if ( v3 ) 2762 if ( v3 )
2763 { 2763 {