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

Fixes

Browse Source 
ARTY:
* Rearming group will not always use 20 km/h = 11 mph.

SET_GROUP(+DESIGNATE):
* Fixed bug in SET_GROUP:FindNearestGroupFromPointVec2( PointVec2 ) function. This caused DESIGNATE class to crash!
This commit is contained in:
funkyfranky 2018-07-21 00:26:46 +02:00
parent b669ce6d98
commit c7aa799378
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,15 +859,16 @@ end
function SET_GROUP:FindNearestGroupFromPointVec2( PointVec2 ) function SET_GROUP:FindNearestGroupFromPointVec2( PointVec2 )
self:F2( PointVec2 ) self:F2( PointVec2 )
local NearestGroup = nil local NearestGroup = nil --Wrapper.Group#GROUP
local ClosestDistance = nil local ClosestDistance = nil
for ObjectID, ObjectData in pairs( self.Set ) do for ObjectID, ObjectData in pairs( self.Set ) do
if NearestGroup == nil then if NearestGroup == nil then
NearestGroup = ObjectData NearestGroup = ObjectData
ClosestDistance = PointVec2:DistanceFromVec2( ObjectData:GetVec2() ) NearestGroup:GetVec2()
ClosestDistance = PointVec2:DistanceFromPointVec2( ObjectData:GetCoordinate() )
else else
local Distance = PointVec2:DistanceFromVec2( ObjectData:GetVec2() ) local Distance = PointVec2:DistanceFromPointVec2( ObjectData:GetCoordinate() )
if Distance < ClosestDistance then if Distance < ClosestDistance then
NearestGroup = ObjectData NearestGroup = ObjectData
ClosestDistance = Distance ClosestDistance = Distance

2
Moose Development/Moose/Functional/Artillery.lua
View File

@ -1632,7 +1632,7 @@ function ARTY:onafterStart(Controllable, From, Event, To)
self.RearmingPlaceCoord=nil self.RearmingPlaceCoord=nil
self.relocateafterfire=false self.relocateafterfire=false
self.autorelocate=false self.autorelocate=false
self.RearmingGroupSpeed=20 --self.RearmingGroupSpeed=20
end end
-- Check that default speed is below max speed. -- Check that default speed is below max speed.