mirror of
https://github.com/akaAgar/the-universal-mission-for-dcs-world.git
synced 2026-08-23 09:45:18 +00:00
Removed references to world.getPlayer()
This commit is contained in:
@@ -107,7 +107,7 @@ do
|
|||||||
end
|
end
|
||||||
|
|
||||||
function TUM.mission.getPlayerCallsign()
|
function TUM.mission.getPlayerCallsign()
|
||||||
local player = world.getPlayer()
|
local player = DCSEx.world.getFirstPlayer(TUM.settings.getPlayerCoalition())
|
||||||
if player then return player:getCallsign() end
|
if player then return player:getCallsign() end
|
||||||
return "Flight"
|
return "Flight"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -138,7 +138,9 @@ do
|
|||||||
-- "Change altitude" submenu
|
-- "Change altitude" submenu
|
||||||
------------------------------------------------------
|
------------------------------------------------------
|
||||||
local altitudePath = missionCommands.addSubMenu("Change altitude", rootPath)
|
local altitudePath = missionCommands.addSubMenu("Change altitude", rootPath)
|
||||||
local baseAltitude = DCSEx.converter.metersToFeet(Library.aircraft[world.getPlayer():getTypeName()].altitude)
|
local player = DCSEx.world.getFirstPlayer(TUM.settings.getPlayerCoalition())
|
||||||
|
local baseAltitude = DCSEx.converter.metersToFeet(10000)
|
||||||
|
if player then baseAltitude = DCSEx.converter.metersToFeet(Library.aircraft[player:getTypeName()].altitude) end
|
||||||
local altitudeFactions = { 0, 0.25, 0.5, 0.75, 1.0, 1.25, 1.5 }
|
local altitudeFactions = { 0, 0.25, 0.5, 0.75, 1.0, 1.25, 1.5 }
|
||||||
for _,f in ipairs(altitudeFactions) do
|
for _,f in ipairs(altitudeFactions) do
|
||||||
local altText = DCSEx.string.toStringThousandsSeparator(math.floor((baseAltitude * f) / 100) * 100).."ft"
|
local altText = DCSEx.string.toStringThousandsSeparator(math.floor((baseAltitude * f) / 100) * 100).."ft"
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ do
|
|||||||
end
|
end
|
||||||
|
|
||||||
local function getAltitude()
|
local function getAltitude()
|
||||||
local player = world.getPlayer()
|
local player = DCSEx.world.getFirstPlayer(TUM.settings.getPlayerCoalition())
|
||||||
if not player then return 600 end -- Don't care about altitude if player's dead anyway
|
if not player then return 600 end -- Don't care about altitude if player's dead anyway
|
||||||
|
|
||||||
local altitude = Library.aircraft[player:getTypeName()].altitude * cruiseAltitudeFraction
|
local altitude = Library.aircraft[player:getTypeName()].altitude * cruiseAltitudeFraction
|
||||||
@@ -133,10 +133,16 @@ do
|
|||||||
local function getRejoinTaskTable(formationDistance)
|
local function getRejoinTaskTable(formationDistance)
|
||||||
formationDistance = formationDistance or 800
|
formationDistance = formationDistance or 800
|
||||||
|
|
||||||
|
local player = DCSEx.world.getFirstPlayer(TUM.settings.getPlayerCoalition())
|
||||||
|
local groupID = 1
|
||||||
|
if player then
|
||||||
|
groupID = DCSEx.dcs.getObjectIDAsNumber(player:getGroup()) or 1
|
||||||
|
end
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id = "Follow",
|
id = "Follow",
|
||||||
params = {
|
params = {
|
||||||
groupId = DCSEx.dcs.getObjectIDAsNumber(world.getPlayer():getGroup()),
|
groupId = groupID,
|
||||||
lastWptIndexFlag = false,
|
lastWptIndexFlag = false,
|
||||||
lastWptIndex = -1,
|
lastWptIndex = -1,
|
||||||
pos = { x = -formationDistance, y = 0, z = -formationDistance }
|
pos = { x = -formationDistance, y = 0, z = -formationDistance }
|
||||||
|
|||||||
Reference in New Issue
Block a user