aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-30 12:31:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'core'

Browse Source
This commit is contained in:
Unknown
2018-03-13 17:06:28 +00:00
parent 66efc90b7f 8676dcf7fd
commit f9eecd315d
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ExpCore/gui.lua
View File

@@ -93,11 +93,6 @@ Event.register(-1,function(event)
end):open() end):open()
end) end)
local function _thread()
local thread = Server.get_thread('camera-follow')
if not thread then error('Camera Follow Thread Is Missing') end
return thread
end
--- Adds a camera that updates every tick (or less depeading on how many are opening) it will move to follow an entity --- Adds a camera that updates every tick (or less depeading on how many are opening) it will move to follow an entity
-- @usage Gui.cam_link{entity=game.player.character,frame=frame,width=50,hight=50,zoom=1} -- @usage Gui.cam_link{entity=game.player.character,frame=frame,width=50,hight=50,zoom=1}
-- @usage Gui.cam_link{entity=game.player.character,cam=frame.camera,surface=game.surfaces['testing']} -- @usage Gui.cam_link{entity=game.player.character,cam=frame.camera,surface=game.surfaces['testing']}
@@ -125,7 +120,7 @@ function Gui.cam_link(data)
data.cam.style.width = data.width or 100 data.cam.style.width = data.width or 100
data.cam.style.height = data.height or 100 data.cam.style.height = data.height or 100
else return end else return end
if not Server or not Server._thread then if not Server or not Server._thread or not Server.get_thread('camera-follow') then
if not Gui._global().cams then if not Gui._global().cams then
Gui._global().cams = {} Gui._global().cams = {}
Gui._global().cam_index = 1 Gui._global().cam_index = 1
@@ -144,7 +139,7 @@ function Gui.cam_link(data)
end end
end end
else else
local thread = _thread() local thread = Server.get_thread('camera-follow')
local surface = data.surface and data.surface.index or nil local surface = data.surface and data.surface.index or nil
table.insert(thread.data.cams,{cam=data.cam,entity=data.entity,surface=surface}) table.insert(thread.data.cams,{cam=data.cam,entity=data.entity,surface=surface})
if data.respawn_open then if data.respawn_open then