Mercurial > mm7
changeset 1591:d687f6e7c610
Boat dialogue
| author | Ritor1 |
|---|---|
| date | Wed, 11 Sep 2013 18:01:16 +0600 |
| parents | 5792fdafe2f5 |
| children | 1efbaf1d01c3 |
| files | GUIWindow.cpp UI/UIHouses.cpp UI/UIHouses.h |
| diffstat | 3 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/GUIWindow.cpp Wed Sep 11 09:39:09 2013 +0600 +++ b/GUIWindow.cpp Wed Sep 11 18:01:16 2013 +0600 @@ -1037,6 +1037,7 @@ TempleDialog(); break; case BuildingType_Stables: + case BuildingType_Boats: TravelByTransport(); break; case BuildingType_Training:
--- a/UI/UIHouses.cpp Wed Sep 11 09:39:09 2013 +0600 +++ b/UI/UIHouses.cpp Wed Sep 11 18:01:16 2013 +0600 @@ -1980,7 +1980,7 @@ sprintf(pTopicArray[index], "\f%05d", TargetColor(255, 255, 255)); //hired NPC premium(премия наёмного НПС)---------------------------------- travel_time = transport_schedule[schedule_id].uTravelTime; - if ( (unsigned int)window_SpeakInHouse->ptr_1C >= HOUSE_BOATS_63 ) + if ( (unsigned int)window_SpeakInHouse->ptr_1C >= HOUSE_BOATS_EMERALD_ISLE ) { if ( CheckHiredNPCSpeciality(Sailor) ) travel_time -= 2;
--- a/UI/UIHouses.h Wed Sep 11 09:39:09 2013 +0600 +++ b/UI/UIHouses.h Wed Sep 11 18:01:16 2013 +0600 @@ -58,19 +58,19 @@ HOUSE_STABLES_STEADWICK = 55, HOUSE_STABLES_TULAREAN_FOREST = 56, HOUSE_STABLES_DEYJA = 57, - HOUSE_STABLES_58 = 58, - HOUSE_STABLES_59 = 59, - HOUSE_STABLES_60 = 60, + HOUSE_STABLES_BRACADA_DESERT = 58, + HOUSE_STABLES_TATALIA = 59, + HOUSE_STABLES_AVLEE = 60, HOUSE_STABLES_61 = 61, HOUSE_STABLES_62 = 62, - HOUSE_BOATS_63 = 63, - HOUSE_BOATS_64 = 64, - HOUSE_BOATS_65 = 65, - HOUSE_BOATS_66 = 66, - HOUSE_BOATS_67 = 67, + HOUSE_BOATS_EMERALD_ISLE = 63, + HOUSE_BOATS_ERATHIA = 64, + HOUSE_BOATS_TULAREAN_FOREST = 65, + HOUSE_BOATS_BRACADA_DESERT = 66, + HOUSE_BOATS_EVENMORN_ISLAND = 67, HOUSE_BOATS_68 = 68, - HOUSE_BOATS_69 = 69, - HOUSE_BOATS_70 = 70, + HOUSE_BOATS_TATALIA = 69, + HOUSE_BOATS_AVLEE = 70, HOUSE_BOATS_71 = 71, HOUSE_BOATS_72 = 72, HOUSE_BOATS_73 = 73,