Mercurial > mm7

comparison mm7_4.cpp @ 785:a821bbace194

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Sun, 24 Mar 2013 09:18:51 +0600
parents 67b77b052ef3
children da80bd2922df
comparison
equal deleted inserted replaced
774:c319601893af 785:a821bbace194
8777 v23 = byte_4F0E10[(unsigned int)v22 - HOUSE_STABLES_HARMONDALE][v62]; 8777 v23 = byte_4F0E10[(unsigned int)v22 - HOUSE_STABLES_HARMONDALE][v62];
8778 //v23 = (unsigned __int8)*(&_4F0D38_TravelInfo[4 * (unsigned int)v22] + v62); // negindex. actual address is around + 0x36 8778 //v23 = (unsigned __int8)*(&_4F0D38_TravelInfo[4 * (unsigned int)v22] + v62); // negindex. actual address is around + 0x36
8779 //v61 = (Player *)(unsigned __int8)*(&_4F0D38_TravelInfo[4 * (unsigned int)v22] + v62); // + 0x3F for sea travels, less for land 8779 //v61 = (Player *)(unsigned __int8)*(&_4F0D38_TravelInfo[4 * (unsigned int)v22] + v62); // + 0x3F for sea travels, less for land
8780 v24 = v16->GetControl(v60); 8780 v24 = v16->GetControl(v60);
8781 if ( v23 != v58 8781 if ( v23 != v58
8782 && ((signed int)s1 >= 6 ? (v25 = 1) : (v25 = array_4F09B0[v23].pSchedule[pParty->uDaysPlayed % 7]), 8782 && ((signed int)s1 >= 6 ? (v25 = 1) : (v25 = travel_schedule[v23].pSchedule[pParty->uDaysPlayed % 7]),
8783 v25 8783 v25
8784 && (array_4F09B0[v23].uQuestBit || _449B57_test_bit(pParty->_quest_bits, array_4F09B0[v23].uQuestBit))) ) 8784 && (travel_schedule[v23].uQuestBit || _449B57_test_bit(pParty->_quest_bits, travel_schedule[v23].uQuestBit))) )
8785 { 8785 {
8786 v58 = v23; 8786 v58 = v23;
8787 v27 = (const char *)v56; 8787 v27 = (const char *)v56;
8788 if ( pDialogueWindow->pCurrentPosActiveItem != s1 ) 8788 if ( pDialogueWindow->pCurrentPosActiveItem != s1 )
8789 v27 = (const char *)v57; 8789 v27 = (const char *)v57;
8790 //v32.uRedbookTrackID = v27; 8790 //v32.uRedbookTrackID = v27;
8791 sprintf(a1, "\f%05d", v27); 8791 sprintf(a1, "\f%05d", v27);
8792 v66 = array_4F09B0[v23].uTravelTime; 8792 v66 = travel_schedule[v23].uTravelTime;
8793 if ( (signed int)window_SpeakInHouse->ptr_1C >= 63 ) 8793 if ( (signed int)window_SpeakInHouse->ptr_1C >= 63 )
8794 { 8794 {
8795 if ( CheckHiredNPCSpeciality(Sailor) ) 8795 if ( CheckHiredNPCSpeciality(Sailor) )
8796 v66 -= 2; 8796 v66 -= 2;
8797 if ( CheckHiredNPCSpeciality(Navigator) ) 8797 if ( CheckHiredNPCSpeciality(Navigator) )
8810 --v66; 8810 --v66;
8811 if ( v66 < 1 ) 8811 if ( v66 < 1 )
8812 v66 = 1; 8812 v66 = 1;
8813 if ( v23 != v2 ) 8813 if ( v23 != v2 )
8814 { 8814 {
8815 memcpy(&v32, &pMapStats->pInfos[array_4F09B0[v23].uMapInfoID], 0x44u); 8815 memcpy(&v32, &pMapStats->pInfos[travel_schedule[v23].uMapInfoID], 0x44u);
8816 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[404], // Time - %d days, destination %s 8816 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[404], // Time - %d days, destination %s
8817 v66, v32.pName); 8817 v66, v32.pName);
8818 strcat(a1, pTmpBuf); 8818 strcat(a1, pTmpBuf);
8819 v28 = a1; 8819 v28 = a1;
8820 a1 += 100; 8820 a1 += 100;
8884 goto LABEL_33;*/ 8884 goto LABEL_33;*/
8885 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 8885 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
8886 } 8886 }
8887 Party::TakeGold(s1); 8887 Party::TakeGold(s1);
8888 //v47[1] = (const char *)7; 8888 //v47[1] = (const char *)7;
8889 v5 = &array_4F09B0[byte_4F0CD0[(unsigned int)window_SpeakInHouse->ptr_1C - 1][dialog_menu_id - 1]]; 8889 v5 = &travel_schedule[byte_4F0CD0[(unsigned int)window_SpeakInHouse->ptr_1C - 1][dialog_menu_id - 1]];
8890 if ( v5->pSchedule[pParty->uDaysPlayed % 7] ) 8890 if ( v5->pSchedule[pParty->uDaysPlayed % 7] )
8891 { 8891 {
8892 if ( _strcmpi(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename) ) 8892 if ( _strcmpi(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename) )
8893 { 8893 {
8894 SaveGame(1, 0); 8894 SaveGame(1, 0);