Remove more instances of GetUnitBeingBuilt() (FAForever#1578)

Arifi · Oct 4, 2016 · bf22a0d · bf22a0d
1 parent bb437e4
commit bf22a0d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lua/AI/OpAI/BaseManager.lua b/lua/AI/OpAI/BaseManager.lua
@@ -1040,7 +1040,7 @@ BaseManager = Class {
                 upgrading = false
                 if unit and not unit:IsDead() then
                     if not newUnit then
-                        newUnit = unit:GetUnitBeingBuilt()
+                        newUnit = unit.UnitBeingBuilt
                     end
                     upgrading = true
                 end

diff --git a/lua/AI/OpAI/BaseManagerPlatoonThreads.lua b/lua/AI/OpAI/BaseManagerPlatoonThreads.lua
@@ -408,7 +408,7 @@ function DoConditionalBuild(singleEngineerPlatoon)
     while aiBrain:PlatoonExists(singleEngineerPlatoon) do
 
         if not unitInstance then
-            unitInstance = engineer:GetUnitBeingBuilt()
+            unitInstance = engineer.UnitBeingBuilt
 
             if unitInstance then
                 -- Store the unit
@@ -597,7 +597,7 @@ function BaseManagerAssistThread( platoon )
                         if not constructionUnit:IsDead() and constructionUnit:IsUnitState('Building') then
 
                             -- Check to make sure unit being built is of proper category
-                            local buildingUnit = constructionUnit:GetUnitBeingBuilt()
+                            local buildingUnit = constructionUnit.UnitBeingBuilt
                             if buildingUnit and not buildingUnit:IsDead() and EntityCategoryContains( buildCat, buildingUnit ) then
 
                                 -- If the unit building is a factory make sure its in the right PBM Location Type
@@ -835,11 +835,11 @@ function BaseManagerEngineerThread(platoon)
                             if not aiBrain:PlatoonExists(platoon) then
                                 return
                             end
-                            if not markedUnfinished and eng:GetUnitBeingBuilt() then
+                            if not markedUnfinished and eng.UnitBeingBuilt then
                                 baseManager.UnfinishedBuildings[unitName] = true
                             end
                             if not nameSet then
-                                local buildingUnit = eng:GetUnitBeingBuilt()
+                                local buildingUnit = eng.UnitBeingBuilt
                                 if unitName and buildingUnit and not buildingUnit:IsDead() then
                                     nameSet = true
                                     local armyIndex = aiBrain:GetArmyIndex()
@@ -930,7 +930,7 @@ function BuildUnfinishedStructures(platoon)
         local buildingEngs = aiBrain:GetListOfUnits( categories.ENGINEER, false )
         -- Find all engineers building structures
         for k,v in buildingEngs do
-            local buildingUnit = v:GetUnitBeingBuilt()
+            local buildingUnit = v.UnitBeingBuilt
             if buildingUnit and buildingUnit.UnitName then
                 beingBuiltList[buildingUnit.UnitName] = true
             end

diff --git a/lua/editor/BaseManagerBuildConditions.lua b/lua/editor/BaseManagerBuildConditions.lua
@@ -262,7 +262,7 @@ function CategoriesBeingBuilt(aiBrain, baseName, catTable)
     local unitsBuilding = aiBrain:GetListOfUnits( categories.CONSTRUCTION, false )
     for unitNum, unit in unitsBuilding do
         if not unit:IsDead() and unit:IsUnitState('Building') then
-            local buildingUnit = unit:GetUnitBeingBuilt()
+            local buildingUnit = unit.UnitBeingBuilt
             if buildingUnit and not buildingUnit:IsDead() then
                 for catNum, buildeeCat in catTable do
                     local buildCat = ParseEntityCategory(buildeeCat)
@@ -365,7 +365,7 @@ function UnfinishedBuildingsCheck( aiBrain, baseName )
     local beingBuiltList = {}
     local buildingEngs = bManager.AIBrain:GetListOfUnits( categories.ENGINEER, false )
     for k,v in buildingEngs do
-        local buildingUnit = v:GetUnitBeingBuilt()
+        local buildingUnit = v.UnitBeingBuilt
         if buildingUnit and buildingUnit.UnitName then
             beingBuiltList[buildingUnit.UnitName] = true
         end