Mercurial > mm7

changeset 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 c319601893af
children da80bd2922df
files MM7.h UIHouses.cpp mm7_2.cpp mm7_4.cpp mm7_data.cpp
diffstat 5 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/MM7.h	Sun Mar 24 00:32:13 2013 +0600
+++ b/MM7.h	Sun Mar 24 09:18:51 2013 +0600
@@ -276,4 +276,4 @@
   unsigned int  uQuestBit;  // quest bit required to set for this travel option to be enabled; otherwise 0
 };
 #pragma pack(pop)
-extern stru365_travel_info array_4F09B0[];
\ No newline at end of file
+extern stru365_travel_info travel_schedule[];
\ No newline at end of file
--- a/UIHouses.cpp	Sun Mar 24 00:32:13 2013 +0600
+++ b/UIHouses.cpp	Sun Mar 24 09:18:51 2013 +0600
@@ -565,9 +565,9 @@
   {
     uint idx = byte_4F0E10[a1][i];
     //v3 = 8 * byte_4F0E10[a1][i];
-    if (array_4F09B0[idx].pSchedule[pParty->uDaysPlayed % 7])
+    if (travel_schedule[idx].pSchedule[pParty->uDaysPlayed % 7])
     {
-      if (!array_4F09B0[idx].uQuestBit || _449B57_test_bit(pParty->_quest_bits, array_4F09B0[idx].uQuestBit))
+      if (!travel_schedule[idx].uQuestBit || _449B57_test_bit(pParty->_quest_bits, travel_schedule[idx].uQuestBit))
         return true;
     }
     //++v1;
--- a/mm7_2.cpp	Sun Mar 24 00:32:13 2013 +0600
+++ b/mm7_2.cpp	Sun Mar 24 09:18:51 2013 +0600
@@ -928,7 +928,7 @@
 	  {
 		  v8 = window_SpeakInHouse;
 		  if ((in_current_building_type == BildingType_Stables || in_current_building_type == BildingType_Boats) &&
-			  array_4F09B0[byte_4F0CD0[(unsigned int)window_SpeakInHouse->ptr_1C - 1][uMessageParam - 1]].pSchedule[pParty->uDaysPlayed % 7]
+			  travel_schedule[byte_4F0CD0[(unsigned int)window_SpeakInHouse->ptr_1C - 1][uMessageParam - 1]].pSchedule[pParty->uDaysPlayed % 7]
 			|| in_current_building_type != BildingType_Temple || uMessageParam != BildingType_MindGuild )
 		  {
 		//LABEL_9:
--- a/mm7_4.cpp	Sun Mar 24 00:32:13 2013 +0600
+++ b/mm7_4.cpp	Sun Mar 24 09:18:51 2013 +0600
@@ -8779,9 +8779,9 @@
         //v61 = (Player *)(unsigned __int8)*(&_4F0D38_TravelInfo[4 * (unsigned int)v22] + v62); // + 0x3F for sea travels, less for land
         v24 = v16->GetControl(v60);
         if ( v23 != v58
-          && ((signed int)s1 >= 6 ? (v25 = 1) : (v25 = array_4F09B0[v23].pSchedule[pParty->uDaysPlayed % 7]),
+          && ((signed int)s1 >= 6 ? (v25 = 1) : (v25 = travel_schedule[v23].pSchedule[pParty->uDaysPlayed % 7]),
               v25
-           && (array_4F09B0[v23].uQuestBit || _449B57_test_bit(pParty->_quest_bits, array_4F09B0[v23].uQuestBit))) )
+           && (travel_schedule[v23].uQuestBit || _449B57_test_bit(pParty->_quest_bits, travel_schedule[v23].uQuestBit))) )
         {
           v58 = v23;
           v27 = (const char *)v56;
@@ -8789,7 +8789,7 @@
             v27 = (const char *)v57;
           //v32.uRedbookTrackID = v27;
           sprintf(a1, "\f%05d", v27);
-          v66 = array_4F09B0[v23].uTravelTime;
+          v66 = travel_schedule[v23].uTravelTime;
           if ( (signed int)window_SpeakInHouse->ptr_1C >= 63 )
           {
             if ( CheckHiredNPCSpeciality(Sailor) )
@@ -8812,7 +8812,7 @@
             v66 = 1;
           if ( v23 != v2 )
           {
-            memcpy(&v32, &pMapStats->pInfos[array_4F09B0[v23].uMapInfoID], 0x44u);
+            memcpy(&v32, &pMapStats->pInfos[travel_schedule[v23].uMapInfoID], 0x44u);
             sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[404], // Time - %d days, destination %s
               v66, v32.pName);
             strcat(a1, pTmpBuf);
@@ -8886,7 +8886,7 @@
       }
       Party::TakeGold(s1);
       //v47[1] = (const char *)7;
-      v5 = &array_4F09B0[byte_4F0CD0[(unsigned int)window_SpeakInHouse->ptr_1C - 1][dialog_menu_id - 1]];
+      v5 = &travel_schedule[byte_4F0CD0[(unsigned int)window_SpeakInHouse->ptr_1C - 1][dialog_menu_id - 1]];
       if ( v5->pSchedule[pParty->uDaysPlayed % 7] )
       {
         if ( _strcmpi(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename) )
--- a/mm7_data.cpp	Sun Mar 24 00:32:13 2013 +0600
+++ b/mm7_data.cpp	Sun Mar 24 09:18:51 2013 +0600
@@ -1496,7 +1496,7 @@
 
 int price_for_membership[11]={100, 100, 50, 50, 50, 50, 50, 50, 50, 1000, 1000}; // weak
 
-stru365_travel_info array_4F09B0[25] =
+stru365_travel_info travel_schedule[25] =
 {
   {3, {1, 0, 1, 0, 1, 0, 0}, 2, {0, 0, 0}, 0xFFFFB980, 4636, 833, 1536, 0},
   {4, {0, 1, 0, 1, 0, 1, 0}, 2, {0, 0, 0}, 0xFFFFF621, 4294960523, 1153, 896, 0},