Merge pull request #14 from mrSkortch/development

v49
This commit is contained in:
mrSkortch 2015-05-18 20:14:28 -06:00
commit 60d83c3bc3
2 changed files with 4 additions and 3 deletions

View File

@ -8,7 +8,7 @@ mist = {}
-- don't change these
mist.majorVersion = 3
mist.minorVersion = 7
mist.build = 48
mist.build = 49
@ -3186,7 +3186,6 @@ stopFlag
if stopflag == -1 or (type(trigger.misc.getUserFlag(stopflag)) == 'number' and trigger.misc.getUserFlag(stopflag) == 0) or (type(trigger.misc.getUserFlag(stopflag)) == 'boolean' and trigger.misc.getUserFlag(stopflag) == false) then
if Group.getByName(groupName) and Group.getByName(groupName):isExist() == true then
if trigger.misc.getUserFlag(flag) == 0 then
trigger.action.setUserFlag(flag, true)
end
@ -3223,7 +3222,6 @@ mist.flagFunc.group_dead = function(vars)
if stopflag == -1 or (type(trigger.misc.getUserFlag(stopflag)) == 'number' and trigger.misc.getUserFlag(stopflag) == 0) or (type(trigger.misc.getUserFlag(stopflag)) == 'boolean' and trigger.misc.getUserFlag(stopflag) == false) then
if Group.getByName(groupName) and Group.getByName(groupName):isExist() == false or not Group.getByName(groupName) then
if trigger.misc.getUserFlag(flag) == 0 then
trigger.action.setUserFlag(flag, true)
end

View File

@ -1,3 +1,6 @@
v49
-fixed flagFuncs.group_dead and group_alive issue caused via a DCS bug.
v48
-added support for cargo objects within dynAdd and DB scripts
-DBs added entries for static objects