Skip to content

Commit 990e12c

Browse files
authored
Merge pull request #1674 from Stephan-S/beta-testing
1.1.0.6
2 parents 6734da2 + 366a903 commit 990e12c

39 files changed

+1036
-531
lines changed

FS19_AutoDrive/gui/settingsPage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,23 +82,23 @@
8282
<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
8383
<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
8484
</GuiElement>
85-
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="useBeaconLights" toolTipElementId="ingameMenuHelpBoxText">
85+
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="collisionHeigth" toolTipElementId="ingameMenuHelpBoxText">
8686
<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
8787
<GuiElement type="button" profile="multiTextOptionSettingsRight" />
8888
<GuiElement type="text" profile="multiTextOptionSettingsText" />
8989
<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" />
9090
<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
9191
<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
9292
</GuiElement>
93-
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="collisionHeigth" toolTipElementId="ingameMenuHelpBoxText">
93+
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="blinkValue" toolTipElementId="ingameMenuHelpBoxText">
9494
<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
9595
<GuiElement type="button" profile="multiTextOptionSettingsRight" />
9696
<GuiElement type="text" profile="multiTextOptionSettingsText" />
9797
<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" />
9898
<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
9999
<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
100100
</GuiElement>
101-
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="blinkValue" toolTipElementId="ingameMenuHelpBoxText">
101+
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="pathFinderTime" toolTipElementId="ingameMenuHelpBoxText">
102102
<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
103103
<GuiElement type="button" profile="multiTextOptionSettingsRight" />
104104
<GuiElement type="text" profile="multiTextOptionSettingsText" />

FS19_AutoDrive/gui/vehicleSettingsPage.xml

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,6 @@
5050
<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
5151
<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
5252
</GuiElement>
53-
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="pathFinderTime" toolTipElementId="ingameMenuHelpBoxText">
54-
<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
55-
<GuiElement type="button" profile="multiTextOptionSettingsRight" />
56-
<GuiElement type="text" profile="multiTextOptionSettingsText" />
57-
<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" />
58-
<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
59-
<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
60-
</GuiElement>
6153
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="restrictToField" toolTipElementId="ingameMenuHelpBoxText">
6254
<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
6355
<GuiElement type="button" profile="multiTextOptionSettingsRight" />
@@ -122,6 +114,38 @@
122114
<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
123115
<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
124116
</GuiElement>
117+
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="enableParkAtJobFinished" toolTipElementId="ingameMenuHelpBoxText">
118+
<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
119+
<GuiElement type="button" profile="multiTextOptionSettingsRight" />
120+
<GuiElement type="text" profile="multiTextOptionSettingsText" />
121+
<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" />
122+
<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
123+
<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
124+
</GuiElement>
125+
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="useBeaconLights" toolTipElementId="ingameMenuHelpBoxText">
126+
<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
127+
<GuiElement type="button" profile="multiTextOptionSettingsRight" />
128+
<GuiElement type="text" profile="multiTextOptionSettingsText" />
129+
<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" />
130+
<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
131+
<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
132+
</GuiElement>
133+
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="autoTipSide" toolTipElementId="ingameMenuHelpBoxText">
134+
<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
135+
<GuiElement type="button" profile="multiTextOptionSettingsRight" />
136+
<GuiElement type="text" profile="multiTextOptionSettingsText" />
137+
<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" />
138+
<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
139+
<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
140+
</GuiElement>
141+
<GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="autoTrailerCover" toolTipElementId="ingameMenuHelpBoxText">
142+
<GuiElement type="button" profile="multiTextOptionSettingsLeft" />
143+
<GuiElement type="button" profile="multiTextOptionSettingsRight" />
144+
<GuiElement type="text" profile="multiTextOptionSettingsText" />
145+
<GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" />
146+
<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
147+
<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
148+
</GuiElement>
125149
</GuiElement>
126150
</GuiElement>
127151

FS19_AutoDrive/modDesc.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Créer, ajouter, modifier, supprimer vos routes ou points de destination à l'ai
2525
<![CDATA[Этот мод может быть использован для создания сети маршрутов для транспортных средств для автономного вождения. После настройки вы можете указать трактору, стоящему где-угодно рядом с сетью, проехать в любую точку, например, в магазин, поле №1 или в точку продажи.]]>
2626
</ru>
2727
</description>
28-
<version>1.1.0.5</version>
28+
<version>1.1.0.6</version>
2929
<multiplayer supported="true" />
3030
<iconFilename>icon.dds</iconFilename>
3131
<extraSourceFiles>
@@ -62,6 +62,7 @@ Créer, ajouter, modifier, supprimer vos routes ou points de destination à l'ai
6262
<action name="ADRenameMapMarker" category="VEHICLE" ignoreComboMask="false" />
6363
<action name="ADSwapTargets" category="VEHICLE" ignoreComboMask="false" />
6464
<action name="AD_open_notification_history" category="VEHICLE" ignoreComboMask="false" />
65+
<action name="AD_continue" category="VEHICLE" ignoreComboMask="false" />
6566
<action name="ADParkVehicle" category="VEHICLE" ignoreComboMask="false" />
6667
</actions>
6768

FS19_AutoDrive/register.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ source(Utils.getFilename("scripts/Tasks/RefuelTask.lua", g_currentModDirectory))
8989
source(Utils.getFilename("scripts/Tasks/ExitFieldTask.lua", g_currentModDirectory))
9090
source(Utils.getFilename("scripts/Tasks/FollowVehicleTask.lua", g_currentModDirectory))
9191
source(Utils.getFilename("scripts/Tasks/ReverseFromBadLocationTask.lua", g_currentModDirectory))
92+
source(Utils.getFilename("scripts/Tasks/ParkTask.lua", g_currentModDirectory))
9293

9394
source(Utils.getFilename("scripts/Modules/DrivePathModule.lua", g_currentModDirectory))
9495
source(Utils.getFilename("scripts/Modules/CollisionDetectionModule.lua", g_currentModDirectory))

FS19_AutoDrive/scripts/AutoDrive.lua

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AutoDrive = {}
2-
AutoDrive.version = "1.1.0.5-RC6"
2+
AutoDrive.version = "1.1.0.6"
33

44
AutoDrive.directory = g_currentModDirectory
55

@@ -86,6 +86,7 @@ AutoDrive.actions = {
8686
{"ADRenameMapMarker", false, 0},
8787
{"ADSwapTargets", false, 0},
8888
{"AD_open_notification_history", false, 0},
89+
{"AD_continue", false, 3},
8990
{"ADParkVehicle", false, 0}
9091
}
9192

@@ -233,16 +234,18 @@ function AutoDrive:keyEvent(unicode, sym, modifier, isDown)
233234
AutoDrive.isCAPSKeyActive = bitAND(modifier, Input.MOD_CAPS) > 0
234235
AutoDrive.rightCTRLmodifierKeyPressed = bitAND(modifier, Input.MOD_RCTRL) > 0
235236

236-
if (AutoDrive.rightCTRLmodifierKeyPressed and AutoDrive.toggleSphrere == true) then
237-
AutoDrive.toggleSphrere = false
238-
elseif (AutoDrive.rightCTRLmodifierKeyPressed and AutoDrive.toggleSphrere == false) then
239-
AutoDrive.toggleSphrere = true
240-
end
237+
if AutoDrive.isInExtendedEditorMode() then
238+
if (AutoDrive.rightCTRLmodifierKeyPressed and AutoDrive.toggleSphrere == true) then
239+
AutoDrive.toggleSphrere = false
240+
elseif (AutoDrive.rightCTRLmodifierKeyPressed and AutoDrive.toggleSphrere == false) then
241+
AutoDrive.toggleSphrere = true
242+
end
241243

242-
if (AutoDrive.leftCTRLmodifierKeyPressed or AutoDrive.leftALTmodifierKeyPressed) then
243-
AutoDrive.enableSphrere = true
244-
else
245-
AutoDrive.enableSphrere = AutoDrive.toggleSphrere
244+
if (AutoDrive.leftCTRLmodifierKeyPressed or AutoDrive.leftALTmodifierKeyPressed) then
245+
AutoDrive.enableSphrere = true
246+
else
247+
AutoDrive.enableSphrere = AutoDrive.toggleSphrere
248+
end
246249
end
247250
end
248251

FS19_AutoDrive/scripts/ExternalInterface.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,12 @@ function AutoDrive:StopCP(vehicle)
195195
if vehicle == nil then
196196
return
197197
end
198-
198+
AutoDrive.debugPrint(vehicle, AutoDrive.DC_EXTERNALINTERFACEINFO, "AutoDrive:StopCP...")
199199
if g_courseplay ~= nil and vehicle.cp ~= nil and vehicle.getIsCourseplayDriving ~= nil and vehicle:getIsCourseplayDriving() then
200200
if vehicle.ad.stateModule:getStartCP_AIVE() then
201201
vehicle.ad.stateModule:toggleStartCP_AIVE()
202202
end
203+
AutoDrive.debugPrint(vehicle, AutoDrive.DC_EXTERNALINTERFACEINFO, "AutoDrive:StopCP call CP stop")
203204
g_courseplay.courseplay:stop(vehicle)
204205
end
205206
end

FS19_AutoDrive/scripts/Hud.lua

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,8 @@
11
AutoDriveHud = {}
22
AutoDrive.FONT_SCALE = 0.0115
33
AutoDrive.PULLDOWN_ITEM_COUNT = 20
4-
AutoDrive.ItemFilterList = {
5-
34, --Air
6-
--11, -- Cotton --can be transported with trailers apparently
7-
77,
8-
78,
9-
79,
10-
80, --Chicken
11-
61,
12-
62,
13-
63,
14-
64,
15-
65,
16-
66,
17-
67,
18-
68, -- Cows
19-
14, --Eggs
20-
--28, --29, --multiple grass
21-
53,
22-
54,
23-
55,
24-
56,
25-
57,
26-
58,
27-
59,
28-
60, --Horses
29-
25, --Oilseed Radish
30-
73,
31-
74,
32-
75,
33-
76, --Pigs
34-
35,
35-
36,
36-
37,
37-
38,
38-
39, --Round bale
39-
69,
40-
70,
41-
71,
42-
72, --Sheep
43-
40,
44-
41,
45-
42, --Square bale
46-
49, --Tarp?
47-
22, --Tree sapling
48-
1, --Unknown
49-
52, --weed
50-
15 --wool
51-
}
4+
5+
AutoDrive.ItemFilterList = {}
526

537
AutoDrive.pullDownListExpanded = 0
548
AutoDrive.pullDownListDirection = 0
@@ -58,6 +12,53 @@ function AutoDriveHud:new()
5812
local o = {}
5913
setmetatable(o, self)
6014
self.__index = self
15+
-- not allowed fillTypes in HUD
16+
AutoDrive.ItemFilterList = {
17+
g_fillTypeManager:getFillTypeIndexByName('AIR'),
18+
g_fillTypeManager:getFillTypeIndexByName('CHICKEN_TYPE_BLACK'),
19+
g_fillTypeManager:getFillTypeIndexByName('CHICKEN_TYPE_WHITE'),
20+
g_fillTypeManager:getFillTypeIndexByName('CHICKEN_TYPE_BROWN'),
21+
g_fillTypeManager:getFillTypeIndexByName('CHICKEN_TYPE_ROOSTER'),
22+
g_fillTypeManager:getFillTypeIndexByName('COW_TYPE_BROWN'),
23+
g_fillTypeManager:getFillTypeIndexByName('COW_TYPE_BROWN_WHITE'),
24+
g_fillTypeManager:getFillTypeIndexByName('COW_TYPE_BLACK'),
25+
g_fillTypeManager:getFillTypeIndexByName('COW_TYPE_BLACK_WHITE'),
26+
g_fillTypeManager:getFillTypeIndexByName('COW_TYPE_BRAHMAN_BROWN'),
27+
g_fillTypeManager:getFillTypeIndexByName('COW_TYPE_BRAHMAN_WHITE'),
28+
g_fillTypeManager:getFillTypeIndexByName('COW_TYPE_BRAHMAN_LIGHT_BROWN'),
29+
g_fillTypeManager:getFillTypeIndexByName('COW_TYPE_BRAHMAN_GREY'),
30+
g_fillTypeManager:getFillTypeIndexByName('EGG'),
31+
g_fillTypeManager:getFillTypeIndexByName('HORSE_TYPE_BEIGE'),
32+
g_fillTypeManager:getFillTypeIndexByName('HORSE_TYPE_BLACK'),
33+
g_fillTypeManager:getFillTypeIndexByName('HORSE_TYPE_BROWN'),
34+
g_fillTypeManager:getFillTypeIndexByName('HORSE_TYPE_BROWN_WHITE'),
35+
g_fillTypeManager:getFillTypeIndexByName('HORSE_TYPE_DARK_BROWN'),
36+
g_fillTypeManager:getFillTypeIndexByName('HORSE_TYPE_GREY'),
37+
g_fillTypeManager:getFillTypeIndexByName('HORSE_TYPE_LIGHT_BROWN'),
38+
g_fillTypeManager:getFillTypeIndexByName('HORSE_TYPE_RED_BROWN'),
39+
g_fillTypeManager:getFillTypeIndexByName('OILSEEDRADISH'),
40+
g_fillTypeManager:getFillTypeIndexByName('PIG_TYPE_RED'),
41+
g_fillTypeManager:getFillTypeIndexByName('PIG_TYPE_WHITE'),
42+
g_fillTypeManager:getFillTypeIndexByName('PIG_TYPE_BLACK_WHITE'),
43+
g_fillTypeManager:getFillTypeIndexByName('PIG_TYPE_BLACK'),
44+
g_fillTypeManager:getFillTypeIndexByName('ROUNDBALE'),
45+
g_fillTypeManager:getFillTypeIndexByName('ROUNDBALE_GRASS'),
46+
g_fillTypeManager:getFillTypeIndexByName('ROUNDBALE_DRYGRASS'),
47+
g_fillTypeManager:getFillTypeIndexByName('ROUNDBALE_WHEAT'),
48+
g_fillTypeManager:getFillTypeIndexByName('ROUNDBALE_BARLEY'),
49+
g_fillTypeManager:getFillTypeIndexByName('SHEEP_TYPE_WHITE'),
50+
g_fillTypeManager:getFillTypeIndexByName('SHEEP_TYPE_BROWN'),
51+
g_fillTypeManager:getFillTypeIndexByName('SHEEP_TYPE_BLACK_WHITE'),
52+
g_fillTypeManager:getFillTypeIndexByName('SHEEP_TYPE_BLACK'),
53+
g_fillTypeManager:getFillTypeIndexByName('SQUAREBALE'),
54+
g_fillTypeManager:getFillTypeIndexByName('SQUAREBALE_WHEAT'),
55+
g_fillTypeManager:getFillTypeIndexByName('SQUAREBALE_BARLEY'),
56+
g_fillTypeManager:getFillTypeIndexByName('TARP'),
57+
g_fillTypeManager:getFillTypeIndexByName('TREESAPLINGS'),
58+
g_fillTypeManager:getFillTypeIndexByName('UNKNOWN'),
59+
g_fillTypeManager:getFillTypeIndexByName('WEED'),
60+
g_fillTypeManager:getFillTypeIndexByName('WOOL')
61+
}
6162
return o
6263
end
6364

FS19_AutoDrive/scripts/Hud/HudButton.lua

Lines changed: 3 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -135,39 +135,7 @@ function ADHudButton:getNewState(vehicle)
135135
end
136136

137137
if self.primaryAction == "input_parkVehicle" then
138-
local actualParkDestination = -1
139-
local SelectedWorkTool = nil
140-
141-
if vehicle ~= nil and vehicle.getAttachedImplements and #vehicle:getAttachedImplements() > 0 and g_dedicatedServerInfo == nil then
142-
local allImp = {}
143-
-- Credits to Tardis from FS17
144-
local function addAllAttached(obj)
145-
for _, imp in pairs(obj:getAttachedImplements()) do
146-
addAllAttached(imp.object)
147-
table.insert(allImp, imp)
148-
end
149-
end
150-
151-
addAllAttached(vehicle)
152-
153-
if allImp ~= nil then
154-
for i = 1, #allImp do
155-
local imp = allImp[i]
156-
if imp ~= nil and imp.object ~= nil and imp.object:getIsSelected() then
157-
SelectedWorkTool = imp.object
158-
break
159-
end
160-
end
161-
end
162-
end
163-
if SelectedWorkTool ~= nil and SelectedWorkTool ~= vehicle and SelectedWorkTool.advd ~= nil and SelectedWorkTool.advd.getWorkToolParkDestination ~= nil then
164-
actualParkDestination = SelectedWorkTool.advd:getWorkToolParkDestination()
165-
else
166-
if vehicle ~= nil and vehicle.ad ~= nil and vehicle.ad.stateModule ~= nil and vehicle.ad.stateModule.getParkDestination ~= nil then
167-
-- g_logManager:info("[AD] ADInputManager:input_parkVehicle vehicle %s vehicle:getIsSelected() %s", tostring(vehicle), tostring(vehicle:getIsSelected()))
168-
actualParkDestination = vehicle.ad.stateModule:getParkDestination()
169-
end
170-
end
138+
local actualParkDestination = AutoDrive.getActualParkDestination(vehicle)
171139

172140
if actualParkDestination >= 1 then
173141
newState = 1
@@ -215,42 +183,8 @@ function ADHudButton:act(vehicle, posX, posY, isDown, isUp, button)
215183
end
216184
end
217185
if self.primaryAction == "input_parkVehicle" then
218-
219-
local actualParkDestination = -1
220-
local SelectedWorkTool = nil
221-
222-
if vehicle ~= nil and vehicle.getAttachedImplements and #vehicle:getAttachedImplements() > 0 and g_dedicatedServerInfo == nil then
223-
local allImp = {}
224-
-- Credits to Tardis from FS17
225-
local function addAllAttached(obj)
226-
for _, imp in pairs(obj:getAttachedImplements()) do
227-
addAllAttached(imp.object)
228-
table.insert(allImp, imp)
229-
end
230-
end
231-
232-
addAllAttached(vehicle)
233-
234-
if allImp ~= nil then
235-
for i = 1, #allImp do
236-
local imp = allImp[i]
237-
if imp ~= nil and imp.object ~= nil and imp.object:getIsSelected() then
238-
SelectedWorkTool = imp.object
239-
break
240-
end
241-
end
242-
end
243-
end
244-
if SelectedWorkTool ~= nil and SelectedWorkTool ~= vehicle and SelectedWorkTool.advd ~= nil and SelectedWorkTool.advd.getWorkToolParkDestination ~= nil then
245-
actualParkDestination = SelectedWorkTool.advd:getWorkToolParkDestination()
246-
else
247-
if vehicle ~= nil and vehicle.ad ~= nil and vehicle.ad.stateModule ~= nil and vehicle.ad.stateModule.getParkDestination ~= nil then
248-
-- g_logManager:info("[AD] ADInputManager:input_parkVehicle vehicle %s vehicle:getIsSelected() %s", tostring(vehicle), tostring(vehicle:getIsSelected()))
249-
actualParkDestination = vehicle.ad.stateModule:getParkDestination()
250-
end
251-
end
252-
253-
if actualParkDestination >= 1 then
186+
local actualParkDestination = AutoDrive.getActualParkDestination(vehicle)
187+
if actualParkDestination >= 1 and ADGraphManager:getMapMarkerById(actualParkDestination) ~= nil then
254188
vehicle.ad.sToolTipInfo = ADGraphManager:getMapMarkerById(actualParkDestination).name
255189
end
256190

0 commit comments

Comments
 (0)