From 3754ea6c27e11a2c33de387abacef23708c7a39d Mon Sep 17 00:00:00 2001 From: Grey-Echo Date: Fri, 10 Mar 2017 23:33:31 +0100 Subject: [PATCH] Change RADIO:NewGenericTransmission() and RADIO:NewUnitTransmission() to support optionnal parameters --- Moose Development/Moose/Core/Radio.lua | 46 +++++++++--------- .../RAD-000 - Radio Test Mission.miz | Bin 96451 -> 96453 bytes 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Moose Development/Moose/Core/Radio.lua b/Moose Development/Moose/Core/Radio.lua index cd024c8cd..4cee7589f 100644 --- a/Moose Development/Moose/Core/Radio.lua +++ b/Moose Development/Moose/Core/Radio.lua @@ -69,17 +69,18 @@ end -- -- In this function the data is especially relevant if the broadcaster is anything but a UNIT or a GROUP, -- -- but it will work with a UNIT or a GROUP anyway -- -- Only the RADIO and the Filename are mandatory -function RADIO:NewGenericTransmission(filename, frequency, mod, power) - self:F2({self, filename, frequency, mod, power}) - self.FileName = RADIO:VerifyFileName(filename) - if frequency ~= "" then - self.Frequecy = frequency * 1000 -- Convert to Hz +-- @TODO : Verify the type of passed args and throw errors when necessary +function RADIO:NewGenericTransmission(...) + self:F2(arg) + self.FileName = RADIO:VerifyFileName(arg[1]) + if arg[2] ~= nil then + self.Frequecy = arg[2] * 1000 -- Convert to Hz end - if mod ~= 3 then - self.Modulation = mod + if arg[3] ~= nil then + self.Modulation = arg[3] end - if power ~= 0 then - self.Power = power + if arg[4] ~= nil then + self.Power = arg[4] end return self end @@ -98,23 +99,24 @@ end -- -- but it will work for any POSITIONABLE -- -- Only the RADIO and the Filename are mandatory -- -- Loop : O is no loop, 1 is loop -function RADIO:NewUnitTransmission(filename, subtitle, subtitleDuration, frequency, mod, loop) - self:F2({filename, subtitle, subtitleDuration, frequency, mod, loop}) - self.FileName = RADIO:VerifyFileName(filename) - if subtitle ~= "" then - self.Subtitle = subtitle +-- -- @TODO : Verify the type of passed args and throw errors when necessary +function RADIO:NewUnitTransmission(...) + self:F2(arg) + self.FileName = RADIO:VerifyFileName(arg[1]) + if arg[2] ~= nil then + self.Subtitle = arg[2] end - if subtitleDuration ~= 0 then - self.SubtitleDuration = subtitleDuration + if arg[3] ~= nil then + self.SubtitleDuration = arg[3] end - if frequency ~= 0 then - self.Frequency = frequency * 1000 -- Convert to Hz + if arg[4] ~= nil then + self.Frequency = arg[4] * 1000 -- Convert to Hz end - if mod ~= 3 then - self.Modulation = mod + if arg[5] ~= nil then + self.Modulation = arg[5] end - if loop ~= 3 then - self.Loop = loop + if arg[6] ~= nil then + self.Loop = arg[6] end return self end diff --git a/Moose Test Missions/RAD - Radio/RAD-000 - Radio Test Mission/RAD-000 - Radio Test Mission.miz b/Moose Test Missions/RAD - Radio/RAD-000 - Radio Test Mission/RAD-000 - Radio Test Mission.miz index 99472ddb6824f86e8db1f9763c1909c902edbd65..6a8f93c6dab8525c0215a507584ef89877819606 100644 GIT binary patch delta 5120 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
)DvjCNlTN|;Cw@keR|{@H_e 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 F`4?P7hgtvt