Fixed a group not existing when building the _DATABASE

This commit is contained in:
FlightControl
2016-05-20 16:29:57 +02:00
parent c50f98b8dd
commit 498505b7b8
3 changed files with 64 additions and 52 deletions
+8 -2
View File
@@ -6066,6 +6066,8 @@ function CLIENT:GetDCSGroup()
-- else -- else
-- error( "Client " .. self.ClientName .. " not found!" ) -- error( "Client " .. self.ClientName .. " not found!" )
end end
else
--self:E( { "Client not found!", self.ClientName } )
end end
end end
end end
@@ -6789,6 +6791,7 @@ function DATABASE:_RegisterDatabase()
for CoalitionId, CoalitionData in pairs( CoalitionsData ) do for CoalitionId, CoalitionData in pairs( CoalitionsData ) do
for DCSGroupId, DCSGroup in pairs( CoalitionData ) do for DCSGroupId, DCSGroup in pairs( CoalitionData ) do
if DCSGroup:isExist() then
local DCSGroupName = DCSGroup:getName() local DCSGroupName = DCSGroup:getName()
self:E( { "Register Group:", DCSGroup, DCSGroupName } ) self:E( { "Register Group:", DCSGroup, DCSGroupName } )
@@ -6815,6 +6818,9 @@ function DATABASE:_RegisterDatabase()
self.UnitsAlive[DCSUnitName] = self.Units[DCSUnitName] self.UnitsAlive[DCSUnitName] = self.Units[DCSUnitName]
end end
end end
else
self:E( "Group does not exist: " .. DCSGroup )
end
for ClientName, ClientTemplate in pairs( self.Templates.ClientsByName ) do for ClientName, ClientTemplate in pairs( self.Templates.ClientsByName ) do
self.Clients[ClientName] = CLIENT:New( ClientName ) self.Clients[ClientName] = CLIENT:New( ClientName )
@@ -15302,9 +15308,9 @@ end
-- * **Frequency Decrease**: Decreases the missile tracking message frequency with one second. -- * **Frequency Decrease**: Decreases the missile tracking message frequency with one second.
-- * **Alerts**: Menu to configure alert messages. -- * **Alerts**: Menu to configure alert messages.
-- * **To All**: Shows alert messages to all players. -- * **To All**: Shows alert messages to all players.
-- * **To Target**: Shows alter messages only to the player where the missile is (was) targetted at. -- * **To Target**: Shows alert messages only to the player where the missile is (was) targetted at.
-- * **Hits On**: Show missile hit alert messages. -- * **Hits On**: Show missile hit alert messages.
-- * **Hits Off**: Disable missile hit altert messages. -- * **Hits Off**: Disable missile hit alert messages.
-- * **Launches On**: Show missile launch messages. -- * **Launches On**: Show missile launch messages.
-- * **Launches Off**: Disable missile launch messages. -- * **Launches Off**: Disable missile launch messages.
-- * **Details**: Menu to configure message details. -- * **Details**: Menu to configure message details.
+2
View File
@@ -223,6 +223,8 @@ function CLIENT:GetDCSGroup()
-- else -- else
-- error( "Client " .. self.ClientName .. " not found!" ) -- error( "Client " .. self.ClientName .. " not found!" )
end end
else
--self:E( { "Client not found!", self.ClientName } )
end end
end end
end end
+4
View File
@@ -453,6 +453,7 @@ function DATABASE:_RegisterDatabase()
for CoalitionId, CoalitionData in pairs( CoalitionsData ) do for CoalitionId, CoalitionData in pairs( CoalitionsData ) do
for DCSGroupId, DCSGroup in pairs( CoalitionData ) do for DCSGroupId, DCSGroup in pairs( CoalitionData ) do
if DCSGroup:isExist() then
local DCSGroupName = DCSGroup:getName() local DCSGroupName = DCSGroup:getName()
self:E( { "Register Group:", DCSGroup, DCSGroupName } ) self:E( { "Register Group:", DCSGroup, DCSGroupName } )
@@ -479,6 +480,9 @@ function DATABASE:_RegisterDatabase()
self.UnitsAlive[DCSUnitName] = self.Units[DCSUnitName] self.UnitsAlive[DCSUnitName] = self.Units[DCSUnitName]
end end
end end
else
self:E( "Group does not exist: " .. DCSGroup )
end
for ClientName, ClientTemplate in pairs( self.Templates.ClientsByName ) do for ClientName, ClientTemplate in pairs( self.Templates.ClientsByName ) do
self.Clients[ClientName] = CLIENT:New( ClientName ) self.Clients[ClientName] = CLIENT:New( ClientName )