weyne/MissionScriptingTools
1
0
Fork 0
mirror of https://github.com/mrSkortch/MissionScriptingTools.git synced 2025-08-15 10:47:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert display to v4

Browse Source 
Reverting message display to v4 of function.
This commit is contained in:
mrSkortch 2022-03-07 02:54:50 -07:00
parent eb0d16b556
commit 9e38ae5087
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mist.lua
View File

@ -6369,7 +6369,7 @@ do -- mist.msg scope
local caMSGtoGroup = false local caMSGtoGroup = false
local anyUpdate = false local anyUpdate = false
local anySound = false local anySound = false
local lastMessageTime = nil local lastMessageTime = math.huge
if env.mission.groundControl then -- just to be sure? if env.mission.groundControl then -- just to be sure?
for index, value in pairs(env.mission.groundControl) do for index, value in pairs(env.mission.groundControl) do
@ -6391,11 +6391,11 @@ do -- mist.msg scope
end end
local function mistdisplayV5() local function mistdisplayV5()
--log:warn("mistdisplayV5: $1", timer.getTime()) log:warn("mistdisplayV5: $1", timer.getTime())
local clearView = true local clearView = true
if #messageList > 0 then if #messageList > 0 then
--log:warn('Updates: $1', anyUpdate) log:warn('Updates: $1', anyUpdate)
if anyUpdate == true or anySound == true then if anyUpdate == true or anySound == true then
local activeClients = {} local activeClients = {}
@ -6413,8 +6413,9 @@ do -- mist.msg scope
local msgTableSound = {} local msgTableSound = {}
local curTime = timer.getTime() local curTime = timer.getTime()
for mInd, messageData in pairs(messageList) do for mInd, messageData in pairs(messageList) do
--log:warn(messageData) log:warn(messageData)
if messageData.displayTill < curTime then if messageData.displayTill < curTime then
log:warn('remove')
messageData:remove() -- now using the remove/destroy function. messageData:remove() -- now using the remove/destroy function.
else else
if messageData.displayedFor then if messageData.displayedFor then
@ -6683,6 +6684,7 @@ end]]
new.displayTill = timer.getTime() + vars.displayTime new.displayTill = timer.getTime() + vars.displayTime
new.name = vars.name -- ID to overwrite the older message (if it exists) Basically it replaces a message that is displayed with new text. new.name = vars.name -- ID to overwrite the older message (if it exists) Basically it replaces a message that is displayed with new text.
new.addedAt = timer.getTime() new.addedAt = timer.getTime()
new.clearView = vars.clearView or true
--log:warn('New Message: $1', new.text) --log:warn('New Message: $1', new.text)
if vars.multSound and vars.multSound[1] then if vars.multSound and vars.multSound[1] then
@ -6795,7 +6797,7 @@ end]]
if displayActive == false then if displayActive == false then
displayActive = true displayActive = true
displayFuncId = mist.scheduleFunction(mistdisplayV5, {}, timer.getTime() + messageDisplayRate, messageDisplayRate) displayFuncId = mist.scheduleFunction(mistdisplayV4, {}, timer.getTime() + messageDisplayRate, messageDisplayRate)
end end
return messageID return messageID

12
mist_4_5_108.lua
View File

@ -6369,7 +6369,7 @@ do -- mist.msg scope
local caMSGtoGroup = false local caMSGtoGroup = false
local anyUpdate = false local anyUpdate = false
local anySound = false local anySound = false
local lastMessageTime = nil local lastMessageTime = math.huge
if env.mission.groundControl then -- just to be sure? if env.mission.groundControl then -- just to be sure?
for index, value in pairs(env.mission.groundControl) do for index, value in pairs(env.mission.groundControl) do
@ -6391,11 +6391,11 @@ do -- mist.msg scope
end end
local function mistdisplayV5() local function mistdisplayV5()
--log:warn("mistdisplayV5: $1", timer.getTime()) log:warn("mistdisplayV5: $1", timer.getTime())
local clearView = true local clearView = true
if #messageList > 0 then if #messageList > 0 then
--log:warn('Updates: $1', anyUpdate) log:warn('Updates: $1', anyUpdate)
if anyUpdate == true or anySound == true then if anyUpdate == true or anySound == true then
local activeClients = {} local activeClients = {}
@ -6413,8 +6413,9 @@ do -- mist.msg scope
local msgTableSound = {} local msgTableSound = {}
local curTime = timer.getTime() local curTime = timer.getTime()
for mInd, messageData in pairs(messageList) do for mInd, messageData in pairs(messageList) do
--log:warn(messageData) log:warn(messageData)
if messageData.displayTill < curTime then if messageData.displayTill < curTime then
log:warn('remove')
messageData:remove() -- now using the remove/destroy function. messageData:remove() -- now using the remove/destroy function.
else else
if messageData.displayedFor then if messageData.displayedFor then
@ -6683,6 +6684,7 @@ end]]
new.displayTill = timer.getTime() + vars.displayTime new.displayTill = timer.getTime() + vars.displayTime
new.name = vars.name -- ID to overwrite the older message (if it exists) Basically it replaces a message that is displayed with new text. new.name = vars.name -- ID to overwrite the older message (if it exists) Basically it replaces a message that is displayed with new text.
new.addedAt = timer.getTime() new.addedAt = timer.getTime()
new.clearView = vars.clearView or true
--log:warn('New Message: $1', new.text) --log:warn('New Message: $1', new.text)
if vars.multSound and vars.multSound[1] then if vars.multSound and vars.multSound[1] then
@ -6795,7 +6797,7 @@ end]]
if displayActive == false then if displayActive == false then
displayActive = true displayActive = true
displayFuncId = mist.scheduleFunction(mistdisplayV5, {}, timer.getTime() + messageDisplayRate, messageDisplayRate) displayFuncId = mist.scheduleFunction(mistdisplayV4, {}, timer.getTime() + messageDisplayRate, messageDisplayRate)
end end
return messageID return messageID