Merge branch 'master' of https://github.com/ZeroK-RTS/Zero-K

ZeroK-RTS · Sep 17, 2021 · 9a9df89 · 9a9df89
2 parents 19587c3 + 7a5e8bd
commit 9a9df89
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 12 deletions.
diff --git a/LuaRules/Gadgets/mission_galaxy_campaign_battle.lua b/LuaRules/Gadgets/mission_galaxy_campaign_battle.lua
@@ -1371,18 +1371,6 @@ function GalaxyCampaignHandler.DeployRetinue(unitID, x, z, facing, teamID)
 	end
 end
 
-function GalaxyCampaignHandler.DeployRetinue(unitID, x, z, facing, teamID)
-	local customKeys = select(7, Spring.GetTeamInfo(teamID, true))
-	local retinueData = CustomKeyToUsefulTable(customKeys and customKeys.retinuestartunits)
-	if retinueData then
-		local range = 70 + #retinueData*20
-		for i = 1, #retinueData do
-			local unitData = retinueData[i]
-			PlaceRetinueUnit(unitData.retinueID, range, unitData.unitDefName, x, z, facing, teamID, unitData.experience)
-		end
-	end
-end
-
 function GalaxyCampaignHandler.HasFactoryPlop(teamID)
 	return teamCommParameters[teamID] and teamCommParameters[teamID].facplop
 end

diff --git a/Objects3d/spherebot.s3o b/Objects3d/spherebot.s3o
diff --git a/Objects3d/spherecloaker.s3o b/Objects3d/spherecloaker.s3o
diff --git a/Objects3d/spherecon.s3o b/Objects3d/spherecon.s3o
diff --git a/Objects3d/spherejeth.s3o b/Objects3d/spherejeth.s3o
diff --git a/Objects3d/spherepole.s3o b/Objects3d/spherepole.s3o