move getCurrentSite from dfhack to world

DFHack · Jan 14, 2024 · ce88873 · ce88873
1 parent 5db9c95
commit ce88873
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/internal/caravan/common.lua b/internal/caravan/common.lua
@@ -388,7 +388,7 @@ end
 
 local function get_mandate_noble_roles()
     local roles = {}
-    for _, link in ipairs(dfhack.getCurrentSite().entity_links) do
+    for _, link in ipairs(dfhack.world.getCurrentSite().entity_links) do
         local he = df.historical_entity.find(link.entity_id);
         if not he or
             (he.type ~= df.historical_entity_type.SiteGovernment and

diff --git a/internal/caravan/pedestal.lua b/internal/caravan/pedestal.lua
@@ -105,7 +105,7 @@ local function get_containing_temple_or_guildhall(display_bld)
         end
     end
     if not loc_id then return end
-    local site = dfhack.getCurrentSite()
+    local site = dfhack.world.getCurrentSite()
     local location = utils.binsearch(site.buildings, loc_id, 'id')
     if not location then return end
     local loc_type = location:getType()

diff --git a/internal/confirm/specs.lua b/internal/confirm/specs.lua
@@ -87,7 +87,7 @@ local function has_caravans()
 end
 
 local function get_num_uniforms()
-    local site = dfhack.getCurrentSite() or {}
+    local site = dfhack.world.getCurrentSite() or {}
     for _, entity_site_link in ipairs(site.entity_links or {}) do
         local he = df.historical_entity.find(entity_site_link.entity_id)
         if he and he.type == df.historical_entity_type.SiteGovernment then

diff --git a/internal/quickfort/zone.lua b/internal/quickfort/zone.lua
@@ -312,7 +312,7 @@ local function set_location(zone, location, ctx)
         dfhack.printerr('cannot create a guildhall without a specified profession')
         return
     end
-    local site = dfhack.getCurrentSite()
+    local site = dfhack.world.getCurrentSite()
     local loc_id = nil
     if location.label and safe_index(ctx, 'zone', 'locations', location.label) then
         local cached_loc = ctx.zone.locations[location.label]

diff --git a/modtools/create-unit.lua b/modtools/create-unit.lua
@@ -915,12 +915,12 @@ end
 
 function wildUnit(unit)
   local casteFlags = unit.enemy.caste_flags
-  -- x = dfhack.getCurrentSite().pos.x
-  -- y = dfhack.getCurrentSite().pos.y
+  -- x = dfhack.world.getCurrentSite().pos.x
+  -- y = dfhack.world.getCurrentSite().pos.y
   -- region = df.global.map.map_blocks[df.global.map.x_count_block*x+y]
   if not(casteFlags.CAN_SPEAK or casteFlags.CAN_LEARN) then
     if dfhack.isSiteLoaded() then
-      local site = dfhack.getCurrentSite()
+      local site = dfhack.world.getCurrentSite()
       unit.animal.population.region_x = site.pos.x
       unit.animal.population.region_y = site.pos.y
     end