FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

#Startup

Browse Source 
* Re-instate suppression of error box.
This commit is contained in:
Applevangelist 2023-09-15 09:12:17 +02:00
commit 5048201771
2 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Moose Development/Moose/Core/Set.lua
View File

@ -860,8 +860,10 @@ do -- SET_BASE
self:F3( Object ) self:F3( Object )
local outcome = false local outcome = false
local name = Object:GetName() local name = Object:GetName()
--self:I("SET_BASE: Objectname = "..name)
self:ForEach( self:ForEach(
function(object) function(object)
--self:I("SET_BASE: In set objectname = "..object:GetName())
if object:GetName() == name then if object:GetName() == name then
outcome = true outcome = true
end end
@ -4330,7 +4332,6 @@ do -- SET_CLIENT
function SET_CLIENT:FilterStart() function SET_CLIENT:FilterStart()
if _DATABASE then if _DATABASE then
self:_FilterStart()
self:HandleEvent( EVENTS.Birth, self._EventOnBirth ) self:HandleEvent( EVENTS.Birth, self._EventOnBirth )
self:HandleEvent( EVENTS.Dead, self._EventOnDeadOrCrash ) self:HandleEvent( EVENTS.Dead, self._EventOnDeadOrCrash )
self:HandleEvent( EVENTS.Crash, self._EventOnDeadOrCrash ) self:HandleEvent( EVENTS.Crash, self._EventOnDeadOrCrash )
@ -4339,6 +4340,7 @@ do -- SET_CLIENT
local timing = self.ZoneTimerInterval or 30 local timing = self.ZoneTimerInterval or 30
self.ZoneTimer:Start(timing,timing) self.ZoneTimer:Start(timing,timing)
end end
self:_FilterStart()
end end
return self return self
@ -4574,9 +4576,9 @@ do -- SET_CLIENT
if self.Filter.Callsigns then if self.Filter.Callsigns then
local MClientCallsigns = false local MClientCallsigns = false
local callsign = MClient:GetCallsign() local callsign = MClient:GetCallsign()
--self:T(callsign) --self:I(callsign)
for _,_Callsign in pairs(self.Filter.Callsigns) do for _,_Callsign in pairs(self.Filter.Callsigns) do
if callsign and string.find(callsign,_Callsign) then if callsign and string.find(callsign,_Callsign,1,true) then
MClientCallsigns = true MClientCallsigns = true
end end
end end

4
Moose Development/Moose/Utilities/Enums.lua
View File

@ -26,6 +26,10 @@
-- @field #ENUMS -- @field #ENUMS
ENUMS = {} ENUMS = {}
--- Suppress the error box
env.setErrorMessageBoxEnabled( false )
--- Rules of Engagement. --- Rules of Engagement.
-- @type ENUMS.ROE -- @type ENUMS.ROE
-- @field #number WeaponFree [AIR] AI will engage any enemy group it detects. Target prioritization is based based on the threat of the target. -- @field #number WeaponFree [AIR] AI will engage any enemy group it detects. Target prioritization is based based on the threat of the target.