weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-21 02:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into FF/Fox2

Browse Source
This commit is contained in:
Frank
2020-03-20 16:47:41 +01:00
parent 4991fc9cb4 f9bdbf4e3f
commit 4dd8e53c1c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Functional/ATC_Ground.lua
+2 -2
View File
@@ -2456,7 +2456,7 @@ end
ATC_GROUND_PERSIANGULF = { ATC_GROUND_PERSIANGULF = {
ClassName = "ATC_GROUND_PERSIANGULF", ClassName = "ATC_GROUND_PERSIANGULF",
Airbases = { Airbases = {
[AIRBASE.PersianGulf.Al_Dhafra_AB] = { ---FIX by Wingthor Changed from Abu_Musa_Island_Airport [AIRBASE.PersianGulf.Abu_Musa_Island_Airport] = {
PointsRunways = { PointsRunways = {
[1] = { [1] = {
[1]={["y"]=-122813.71002344,["x"]=-31689.936027827,}, [1]={["y"]=-122813.71002344,["x"]=-31689.936027827,},
@@ -2475,7 +2475,7 @@ ATC_GROUND_PERSIANGULF = {
}, },
}, },
}, },
[AIRBASE.PersianGulf.Abu_Musa_Island_Airport] = { [AIRBASE.PersianGulf.Al_Dhafra_AB] = {
PointsRunways = { PointsRunways = {
[1] = { [1] = {
[1]={["y"]=-174672.06004916,["x"]=-209880.97145616,}, [1]={["y"]=-174672.06004916,["x"]=-209880.97145616,},
Moose Development/Moose/Wrapper/Airbase.lua
+2
View File
@@ -502,6 +502,7 @@ function AIRBASE:GetID(unique)
--env.info(string.format("FF airbase=%s id=%s category=%s", tostring(AirbaseName), tostring(airbaseID), tostring(airbaseCategory))) --env.info(string.format("FF airbase=%s id=%s category=%s", tostring(AirbaseName), tostring(airbaseID), tostring(airbaseCategory)))
-- No way AFIK to get the DCS version. So we check if the event exists. That should tell us if we are on DCS 2.5.6 or prior to that. -- No way AFIK to get the DCS version. So we check if the event exists. That should tell us if we are on DCS 2.5.6 or prior to that.
--[[
if world.event.S_EVENT_KILL and world.event.S_EVENT_KILL>0 and airbaseCategory==Airbase.Category.AIRDROME then if world.event.S_EVENT_KILL and world.event.S_EVENT_KILL>0 and airbaseCategory==Airbase.Category.AIRDROME then
-- We have to take the key value of this loop! -- We have to take the key value of this loop!
@@ -512,6 +513,7 @@ function AIRBASE:GetID(unique)
airbaseID=airbaseID+11 airbaseID=airbaseID+11
end end
end end
]]
if AirbaseName==self.AirbaseName then if AirbaseName==self.AirbaseName then
if airbaseCategory==Airbase.Category.SHIP then if airbaseCategory==Airbase.Category.SHIP then