Update code for updated stdlib

credomane · Feb 6, 2018 · 33ffa7e · 33ffa7e
1 parent 006257b
commit 33ffa7e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/control.lua b/control.lua
@@ -1,12 +1,11 @@
 
 --Include needed stdlib libs.
 require "stdlib/config/config"
-require "stdlib/core"
 require "stdlib/entity/entity"
+require "stdlib/event/gui"
 require "stdlib/game"
-require "stdlib/gui/gui"
 require "stdlib/log/logger"
-require "stdlib/string"
+require 'stdlib/utils/string'
 
 fm = {}
 fm.log = Logger.new("FactorioMaps", "debug", true)

diff --git a/fm/generateMap.lua b/fm/generateMap.lua
@@ -6,9 +6,9 @@ function fm.generateMap(data)
  local basePath = "FactorioMaps/" .. data.folderName
  game.remove_path(basePath)
 
- local inGameTotalWidth = math.ceil(math.abs(data.topLeft.x) + math.abs(data.bottomRight.x))
- local inGameTotalHeight = math.ceil(math.abs(data.topLeft.y) + math.abs(data.bottomRight.y))
- local inGameCenter = Area.center({data.topLeft, data.bottomRight})
+ local mapArea = Area.normalize(Area.round_to_integer({data.topLeft, data.bottomRight}))
+ local _ ,inGameTotalWidth, inGameTotalHeight, _ = Area.size(mapArea)
+ local inGameCenter = Area.center(mapArea)
 
  --Resolution to use for grid sections
  local gridSizes = {256, 512, 1024, 2048}

diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
  "name": "FactorioMaps",
- "version": "0.16.0",
+ "version": "0.16.1",
  "title": "Google Maps Factorio style",
  "author": "jeroon, credomane",
  "contact": "https://github.com/credomane/",