Mercurial > mm7
changeset 778:64cef5a0782a
Merge
| author | Nomad |
|---|---|
| date | Sun, 24 Mar 2013 00:33:27 +0200 |
| parents | b9f6dd6f1444 (current diff) 3dc4a9b13c1b (diff) |
| children | 2a3fd4d89ec2 b27dd658ea77 |
| files | Party.h UIHouses.cpp UIHouses.h mm7_data.cpp mm7_data.h |
| diffstat | 4 files changed, 44 insertions(+), 56 deletions(-) [+] |
line wrap: on
line diff
--- a/Party.h Sun Mar 24 00:15:01 2013 +0200 +++ b/Party.h Sun Mar 24 00:33:27 2013 +0200 @@ -10,6 +10,7 @@ enum PARTY_QUEST_BITS: unsigned __int32 { + PARTY_QUEST_EVENMORN_MAP_FOUND = 64, PARTY_QUEST_FOUNTAIN_HARMONDALE = 206, PARTY_QUEST_FOUNTAIN_NIGHON = 207, PARTY_QUEST_FOUNTAIN_PIERPONT = 208,
--- a/UIHouses.cpp Sun Mar 24 00:15:01 2013 +0200 +++ b/UIHouses.cpp Sun Mar 24 00:33:27 2013 +0200 @@ -42,8 +42,7 @@ { unsigned char uMapInfoID; unsigned char pSchedule[7]; - unsigned char uTravelTime; - unsigned char field_9[3]; + unsigned int uTravelTime; int arrival_x; int arrival_y; int arrival_z; @@ -53,41 +52,41 @@ #pragma pack(pop) stru365_travel_info transport_schedule[35] = // 004F09B0 { - {MAP_STEADWICK, {1, 0, 1, 0, 1, 0, 0}, 2, {0, 0, 0}, -18048, 4636, 833, 1536, 0}, - {MAP_PIERPONT, {0, 1, 0, 1, 0, 1, 0}, 2, {0, 0, 0}, -2527, -6773, 1153, 896, 0}, - {MAP_TATALIA, {1, 0, 1, 0, 1, 0, 0}, 2, {0, 0, 0}, 4730, -10580, 320, 1024, 0}, - {MAP_HARMONDALE, {0, 1, 0, 1, 0, 1, 0}, 2, {0, 0, 0}, -5692, 11137, 1, 1024, 0}, - {MAP_DEYJA, {1, 0, 0, 1, 0, 0, 0}, 3, {0, 0, 0}, 7227, -16007, 2625, 640, 0}, - {MAP_BRAKADA_DESERT, {0, 0, 1, 0, 0, 1, 0}, 3, {0, 0, 0}, 8923, 17191, 1, 512, 0}, - {MAP_AVLEE, {1, 0, 1, 0, 1, 0, 0}, 3, {0, 0, 0}, 17059, 12331, 512, 1152, 0}, - {MAP_DEYJA, {0, 1, 0, 0, 1, 0, 1}, 2, {0, 0, 0}, 7227, -16007, 2625, 640, 0}, - {MAP_HARMONDALE, {0, 1, 0, 1, 0, 1, 0}, 2, {0, 0, 0}, -5692, 11137, 1, 1024, 0}, - {MAP_STEADWICK, {1, 0, 1, 0, 1, 0, 0}, 3, {0, 0, 0}, -18048, 4636, 833, 1536, 0}, - {MAP_PIERPONT, {0, 1, 0, 1, 0, 1, 0}, 2, {0, 0, 0}, -2527, -6773, 1153, 896, 0}, - {MAP_STEADWICK, {1, 0, 1, 0, 1, 0, 1}, 3, {0, 0, 0}, -18048, 4636, 833, 1536, 0}, - {MAP_HARMONDALE, {0, 1, 0, 0, 0, 1, 0}, 5, {0, 0, 0}, -5692, 11137, 1, 1024, 0}, - {MAP_STEADWICK, {0, 1, 0, 1, 0, 1, 0}, 2, {0, 0, 0}, 0xFFFFB980, 4636, 833, 1536, 0}, - {MAP_PIERPONT, {0, 1, 0, 1, 0, 1, 0}, 3, {0, 0, 0}, 0xFFFFF621, 4294960523, 1153, 896, 0}, - {MAP_DEYJA, {0, 0, 1, 0, 0, 0, 1}, 5, {0, 0, 0}, 0x1C3B, 4294951289, 2625, 640, 0}, - {MAP_TATALIA, {0, 1, 0, 1, 0, 1, 0}, 2, {0, 0, 0}, 0xFFFFF779, 4294960355, 97, 0, 0}, - {MAP_AVLEE, {1, 0, 0, 0, 1, 0, 0}, 4, {0, 0, 0}, 0x1EE9, 9476, 193, 0, 0}, - {MAP_EVENMORN_ISLE, {0, 0, 0, 0, 0, 0, 1}, 7, {0, 0, 0}, 0x3D00, 6390, 193, 1536, 64}, - {MAP_BRAKADA_DESERT, {0, 0, 1, 0, 0, 0, 0}, 6, {0, 0, 0}, 0x4AE3, 4294947574, 193, 1024, 0}, - {MAP_AVLEE, {0, 1, 0, 1, 0, 1, 0}, 3, {0, 0, 0}, 0x1EE9, 9476, 193, 0, 0}, - {MAP_BRAKADA_DESERT, {1, 0, 1, 0, 0, 0, 0}, 6, {0, 0, 0}, 0x4AE3, 4294947574, 193, 1024, 0}, - {MAP_TATALIA, {1, 0, 1, 0, 1, 0, 0}, 4, {0, 0, 0}, 0xFFFFF779, 4294960355, 97, 0, 0}, - {MAP_PIERPONT, {0, 0, 0, 0, 0, 1, 0}, 6, {0, 0, 0}, 0xFFFFFD3B, 4294953209, 193, 1024, 0}, - {MAP_STEADWICK, {0, 0, 0, 0, 0, 0, 1}, 6, {0, 0, 0}, 0xFFFFD719, 13497, 193, 1536, 0}, - {MAP_EVENMORN_ISLE, {0, 1, 0, 1, 0, 0, 0}, 1, {0, 0, 0}, 15616, 6390, 193, 1536, 64}, - {MAP_BRAKADA_DESERT, {0, 1, 0, 1, 0, 0, 0}, 1, {0, 0, 0}, 19171, 4294947574, 193, 1024, 0}, - {MAP_STEADWICK, {0, 1, 0, 1, 0, 1, 0}, 2, {0, 0, 0}, 4294956825, 13497, 193, 1536, 0}, - {MAP_BRAKADA_DESERT, {1, 0, 1, 0, 0, 0, 0}, 4, {0, 0, 0}, 19171, 4294947574, 193, 1024, 0}, - {MAP_EVENMORN_ISLE, {0, 0, 0, 0, 0, 0, 1}, 5, {0, 0, 0}, 15616, 6390, 193, 1536, 64}, - {MAP_AVLEE, {0, 0, 0, 0, 1, 0, 0}, 5, {0, 0, 0}, 7913, 9476, 193, 0, 0}, - {MAP_STEADWICK, {0, 1, 0, 0, 0, 1, 0}, 4, {0, 0, 0}, 4294956825, 13497, 193, 1536, 0}, - {MAP_PIERPONT, {1, 0, 1, 0, 1, 0, 0}, 3, {0, 0, 0}, 4294966587, 4294953209, 193, 1024, 0}, - {MAP_TATALIA, {0, 0, 0, 1, 0, 0, 0}, 5, {0, 0, 0}, 4294965113, 4294960355, 97, 0, 0}, - {MAP_ARENA, {0, 0, 0, 0, 0, 0, 1}, 4, {0, 0, 0}, 3844, 2906, 193, 512, 0} + {MAP_STEADWICK, {1, 0, 1, 0, 1, 0, 0}, 2, -18048, 4636, 833, 1536, 0}, + {MAP_PIERPONT, {0, 1, 0, 1, 0, 1, 0}, 2, -2527, -6773, 1153, 896, 0}, + {MAP_TATALIA, {1, 0, 1, 0, 1, 0, 0}, 2, 4730, -10580, 320, 1024, 0}, + {MAP_HARMONDALE, {0, 1, 0, 1, 0, 1, 0}, 2, -5692, 11137, 1, 1024, 0}, + {MAP_DEYJA, {1, 0, 0, 1, 0, 0, 0}, 3, 7227, -16007, 2625, 640, 0}, + {MAP_BRAKADA_DESERT, {0, 0, 1, 0, 0, 1, 0}, 3, 8923, 17191, 1, 512, 0}, + {MAP_AVLEE, {1, 0, 1, 0, 1, 0, 0}, 3, 17059, 12331, 512, 1152, 0}, + {MAP_DEYJA, {0, 1, 0, 0, 1, 0, 1}, 2, 7227, -16007, 2625, 640, 0}, + {MAP_HARMONDALE, {0, 1, 0, 1, 0, 1, 0}, 2, -5692, 11137, 1, 1024, 0}, + {MAP_STEADWICK, {1, 0, 1, 0, 1, 0, 0}, 3, -18048, 4636, 833, 1536, 0}, + {MAP_PIERPONT, {0, 1, 0, 1, 0, 1, 0}, 2, -2527, -6773, 1153, 896, 0}, + {MAP_STEADWICK, {1, 0, 1, 0, 1, 0, 1}, 3, -18048, 4636, 833, 1536, 0}, + {MAP_HARMONDALE, {0, 1, 0, 0, 0, 1, 0}, 5, -5692, 11137, 1, 1024, 0}, + {MAP_STEADWICK, {0, 1, 0, 1, 0, 1, 0}, 2, -18048, 4636, 833, 1536, 0}, + {MAP_PIERPONT, {0, 1, 0, 1, 0, 1, 0}, 3, -2527, -16007, 1153, 896, 0}, + {MAP_DEYJA, {0, 0, 1, 0, 0, 0, 1}, 5, 7227, -16007, 2625, 640, 0}, + {MAP_TATALIA, {0, 1, 0, 1, 0, 1, 0}, 2, -2183, -6941, 97, 0, 0}, + {MAP_AVLEE, {1, 0, 0, 0, 1, 0, 0}, 4, 7913, 9476, 193, 0, 0}, + {MAP_EVENMORN_ISLE, {0, 0, 0, 0, 0, 0, 1}, 7, 15616, 6390, 193, 1536, PARTY_QUEST_EVENMORN_MAP_FOUND}, + {MAP_BRAKADA_DESERT, {0, 0, 1, 0, 0, 0, 0}, 6, 19171, -19722, 193, 1024, 0}, + {MAP_AVLEE, {0, 1, 0, 1, 0, 1, 0}, 3, 7913, 9476, 193, 0, 0}, + {MAP_BRAKADA_DESERT, {1, 0, 1, 0, 0, 0, 0}, 6, 19171, -19722, 193, 1024, 0}, + {MAP_TATALIA, {1, 0, 1, 0, 1, 0, 0}, 4, -2183, -6941, 97, 0, 0}, + {MAP_PIERPONT, {0, 0, 0, 0, 0, 1, 0}, 6, -709, -14087, 193, 1024, 0}, + {MAP_STEADWICK, {0, 0, 0, 0, 0, 0, 1}, 6, -10471, 13497, 193, 1536, 0}, + {MAP_EVENMORN_ISLE, {0, 1, 0, 1, 0, 0, 0}, 1, 15616, 6390, 193, 1536, PARTY_QUEST_EVENMORN_MAP_FOUND}, + {MAP_BRAKADA_DESERT, {0, 1, 0, 1, 0, 0, 0}, 1, 19171, -19722, 193, 1024, 0}, + {MAP_STEADWICK, {0, 1, 0, 1, 0, 1, 0}, 2, -10471, 13497, 193, 1536, 0}, + {MAP_BRAKADA_DESERT, {1, 0, 1, 0, 0, 0, 0}, 4, 19171, -19722, 193, 1024, 0}, + {MAP_EVENMORN_ISLE, {0, 0, 0, 0, 0, 0, 1}, 5, 15616, 6390, 193, 1536, PARTY_QUEST_EVENMORN_MAP_FOUND}, + {MAP_AVLEE, {0, 0, 0, 0, 1, 0, 0}, 5, 7913, 9476, 193, 0, 0}, + {MAP_STEADWICK, {0, 1, 0, 0, 0, 1, 0}, 4, -10471, 13497, 193, 1536, 0}, + {MAP_PIERPONT, {1, 0, 1, 0, 1, 0, 0}, 3, -709, -14087, 193, 1024, 0}, + {MAP_TATALIA, {0, 0, 0, 1, 0, 0, 0}, 5, -2183, -6941, 97, 0, 0}, + {MAP_ARENA, {0, 0, 0, 0, 0, 0, 1}, 4, 3844, 2906, 193, 512, 0} }; unsigned char transport_routes[20][4] = @@ -119,7 +118,7 @@ const stru159 pAnimatedRooms[196] = //0x4E5F70 - { +{ {"", 0x4, 0x1F4, 0, 0, 0}, {"Human Armor01", 0x20, 0x2C0, 2, 58, 0}, {"Necromancer Armor01", 0x20, 0x2D7, 2, 70, 0 }, @@ -316,8 +315,7 @@ {"Human Temple02", 0x24, 0x3AB, 23, 27, 0 }, {"Player Castle Good", 0x24, 0, 25, 0, 0 }, {"Player Castle Bad", 0x24, 0, 25, 0, 0} - }; - +}; @@ -1946,15 +1944,12 @@ { ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u); PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Greeting_2); - /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 ) - return; - pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; - pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 1; - goto LABEL_33;*/ pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); + return; } + Party::TakeGold(s1); - //v47[1] = (const char *)7; + v5 = &transport_schedule[transport_routes[(unsigned int)window_SpeakInHouse->ptr_1C - HOUSE_STABLES_HARMONDALE][dialog_menu_id - HOUSE_DIALOGUE_TRANSPORT_SCHEDULE_1]]; if ( v5->pSchedule[pParty->uDaysPlayed % 7] ) { @@ -2023,15 +2018,7 @@ while ( sub_4BD8B5() ) ; pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); - /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) - { - pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; - pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0; -LABEL_33: - *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; - ++pMessageQueue_50CBD0->uNumMessages; - return; - }*/ + return; } else {
--- a/UIHouses.h Sun Mar 24 00:15:01 2013 +0200 +++ b/UIHouses.h Sun Mar 24 00:33:27 2013 +0200 @@ -97,6 +97,7 @@ HOUSE_JUDGE_HARMONDALE = 190, HOUSE_224_EMERALD_ISLE = 224, HOUSE_225_EMERALD_ISLE = 225, + HOUSE_238_EMERALD_ISLE = 238, HOUSE_466_HARMONDALE = 466, HOUSE_467_HARMONDALE = 467, HOUSE_468_HARMONDALE = 468,
--- a/mm7_data.h Sun Mar 24 00:15:01 2013 +0200 +++ b/mm7_data.h Sun Mar 24 00:33:27 2013 +0200 @@ -1011,7 +1011,6 @@ extern __int16 _4F0882_evt_VAR_PlayerItemInHands_vals[54]; extern unsigned short pMaxLevelPerTrainingHallType[]; extern int price_for_membership[]; // weak - extern Vec2_int_ pMonsterArenaPlacements[20]; extern __int16 word_4F0F30[32]; // weak extern char aS03d[]; // idb