From a95d9cc1fa011d8ceb4d94dbc3a11b9d5643d01a Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Fri, 8 Apr 2016 18:01:17 +0200 Subject: [PATCH] Replace abused Map.ActorsInBox calls by Map.ActorsInWorld in all cnc missions --- mods/cnc/maps/nod02a/nod02a.lua | 6 +++--- mods/cnc/maps/nod02b/nod02b.lua | 6 +++--- mods/cnc/maps/nod05/nod05.lua | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mods/cnc/maps/nod02a/nod02a.lua b/mods/cnc/maps/nod02a/nod02a.lua index ad78934615..b23e9146c1 100644 --- a/mods/cnc/maps/nod02a/nod02a.lua +++ b/mods/cnc/maps/nod02a/nod02a.lua @@ -26,7 +26,7 @@ getActors = function(owner, units) local maxUnits = 0 local actors = { } for type, count in pairs(units) do - local globalActors = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(actor) + local globalActors = Utils.Where(Map.ActorsInWorld, function(actor) return actor.Owner == owner and actor.Type == type and not actor.IsDead end) if #globalActors < count then @@ -234,7 +234,7 @@ Tick = function() end checkProduction = function(player) - local Units = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(actor) + local Units = Utils.Where(Map.ActorsInWorld, function(actor) return actor.Owner == player and actor.Type == UnitToRebuild end) @@ -251,7 +251,7 @@ checkProduction = function(player) end getStartUnits = function() - local Units = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(actor) + local Units = Utils.Where(Map.ActorsInWorld, function(actor) return actor.Owner == enemy end) Utils.Do(Units, function(unit) diff --git a/mods/cnc/maps/nod02b/nod02b.lua b/mods/cnc/maps/nod02b/nod02b.lua index 1f63f6f702..1c9231a4f5 100644 --- a/mods/cnc/maps/nod02b/nod02b.lua +++ b/mods/cnc/maps/nod02b/nod02b.lua @@ -180,7 +180,7 @@ getActors = function(owner, units) local maxUnits = 0 local actors = { } for type, count in pairs(units) do - local globalActors = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(actor) + local globalActors = Utils.Where(Map.ActorsInWorld, function(actor) return actor.Owner == owner and actor.Type == type and not actor.IsDead end) if #globalActors < count then @@ -196,7 +196,7 @@ getActors = function(owner, units) end checkProduction = function(player) - local Units = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(actor) + local Units = Utils.Where(Map.ActorsInWorld, function(actor) return actor.Owner == player and actor.Type == UnitToRebuild end) @@ -213,7 +213,7 @@ checkProduction = function(player) end getStartUnits = function() - local Units = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(actor) + local Units = Utils.Where(Map.ActorsInWorld, function(actor) return actor.Owner == enemy end) Utils.Do(Units, function(unit) diff --git a/mods/cnc/maps/nod05/nod05.lua b/mods/cnc/maps/nod05/nod05.lua index d31edb7bb3..1da5994a36 100644 --- a/mods/cnc/maps/nod05/nod05.lua +++ b/mods/cnc/maps/nod05/nod05.lua @@ -275,7 +275,7 @@ CheckForSams = function(player) end checkProduction = function(player) - local Units = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(actor) + local Units = Utils.Where(Map.ActorsInWorld, function(actor) return actor.Owner == enemy end) @@ -304,7 +304,7 @@ checkProduction = function(player) end getStartUnits = function() - local Units = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(actor) + local Units = Utils.Where(Map.ActorsInWorld, function(actor) return actor.Owner == enemy and ( actor.Type == 'e2' or actor.Type == 'e1' or actor.Type == 'jeep' or actor.Type == 'mtnk') end) Utils.Do(Units, function(unit)