weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-24 12:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Progress version 2 -- better version ...

Browse Source
This commit is contained in:
FlightControl
2017-04-10 16:45:37 +02:00
parent 553435bbcb
commit 785a297a69
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Core/Event.lua
+4 -6
View File
@@ -457,8 +457,7 @@ function EVENT:RemoveForUnit( EventClass, EventID )
local EventClass = EventClass local EventClass = EventClass
local EventPriority = EventClass:GetEventPriority() local EventPriority = EventClass:GetEventPriority()
local Event = self.Events[EventID][EventPriority][EventClass] self.Events[EventID][EventPriority][EventClass] = nil
Event.EventUnit = nil
end end
--- Removes an Events entry for a GROUP. --- Removes an Events entry for a GROUP.
@@ -471,8 +470,7 @@ function EVENT:RemoveForGroup( EventClass, EventID )
local EventClass = EventClass local EventClass = EventClass
local EventPriority = EventClass:GetEventPriority() local EventPriority = EventClass:GetEventPriority()
local Event = self.Events[EventID][EventPriority][EventClass] self.Events[EventID][EventPriority][EventClass] = nil
Event.EventGroup = nil
end end
--- Clears all event subscriptions for a @{Base#BASE} derived object. --- Clears all event subscriptions for a @{Base#BASE} derived object.
@@ -850,8 +848,8 @@ function EVENT:onEvent( Event )
if ( Event.IniDCSUnitName and Event.IniDCSGroupName and Event.IniGroupName and EventData.EventGroup ) or if ( Event.IniDCSUnitName and Event.IniDCSGroupName and Event.IniGroupName and EventData.EventGroup ) or
( Event.TgtDCSUnitName and Event.TgtDCSGroupName and Event.TgtGroupName and EventData.EventGroup ) then ( Event.TgtDCSUnitName and Event.TgtDCSGroupName and Event.TgtGroupName and EventData.EventGroup ) then
local GroupName = EventClass:GetName() if EventClass:IsAlive() then
if GroupName then local GroupName = EventClass:GetName()
if GroupName == Event.IniDCSGroupName or GroupName == Event.TgtDCSGroupName then if GroupName == Event.IniDCSGroupName or GroupName == Event.TgtDCSGroupName then
-- First test if a EventFunction is Set, otherwise search for the default function -- First test if a EventFunction is Set, otherwise search for the default function
if EventData.EventFunction then if EventData.EventFunction then