Fix game start
This commit is contained in:
@@ -3,4 +3,4 @@ Api = {}
|
||||
local modInfo = Mod.getInfo('smc__api__api_loader')
|
||||
local require = modInfo.require
|
||||
|
||||
require('GlobalStep')
|
||||
require('Api.GlobalStep')
|
||||
@@ -32,7 +32,7 @@ end)
|
||||
local callsForEachPlayer = {}
|
||||
|
||||
---@param timeDelay number
|
||||
---@param callbackFunc fun(player:Player, deltaTime:number)
|
||||
---@param callbackFunc fun(deltaTime:number, player:Player)
|
||||
function Api.registerGlobalStepForEachPlayer(timeDelay, callbackFunc)
|
||||
table.insert(callsWithDelay, {
|
||||
timeDelay = timeDelay,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
local modInfo = Mod.getInfo('smc__api__callbacks_control')
|
||||
local modInfo = Mod.getInfo('smc__core__control')
|
||||
local require = modInfo.require
|
||||
|
||||
return require('Control')
|
||||
@@ -1,2 +1,2 @@
|
||||
name = smc__api__callbacks_control
|
||||
depends = smc__api__callbacks
|
||||
name = smc__core__control
|
||||
depends = smc__api__api_loader
|
||||
|
||||
@@ -80,7 +80,7 @@ core.register_on_leaveplayer(function(player, timed_out)
|
||||
playersControlTimer[playerName] = nil
|
||||
end)
|
||||
|
||||
Api.registerGlobalStepForEachPlayer(0, function(player, deltaTime)
|
||||
Api.registerGlobalStepForEachPlayer(0, function(deltaTime, player)
|
||||
if player == nil then
|
||||
return
|
||||
end
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
local modInfo = Mod.getInfo('smc__ui__formspec')
|
||||
local modInfo = Mod.getInfo('smc__core__formspec')
|
||||
local require = modInfo.require
|
||||
|
||||
return require('Formspec')
|
||||
@@ -1,2 +1,2 @@
|
||||
name = smc__core__item
|
||||
depends = smc__api__api_loader, smc__core__enum, smc__core__item_factory
|
||||
depends = smc__api__api_loader, smc__core__item_factory
|
||||
|
||||
@@ -5,9 +5,6 @@
|
||||
-- so global tables need to be preloaded manually.
|
||||
|
||||
-- --- Global APIs load --
|
||||
-- Api loader
|
||||
dofile(core.get_modpath('smc__api__api_loader')..'/init.lua')
|
||||
|
||||
-- Class
|
||||
dofile(core.get_modpath('smc__api__class')..'/init.lua')
|
||||
|
||||
@@ -37,6 +34,10 @@ dofile(core.get_modpath('smc__api__mod')..'/init.lua')
|
||||
-- Table
|
||||
dofile(core.get_modpath('smc__api__table')..'/init.lua')
|
||||
|
||||
-- TODO: пока что закоментировано, поскольку вызывает ошибку из-за global_step
|
||||
-- Api loader
|
||||
-- dofile(core.get_modpath('smc__api__api_loader')..'/init.lua')
|
||||
|
||||
---@type MapGen
|
||||
local mapGenerator = dofile(core.get_modpath('smc__core__map_generator')..'/src/mapGenerator.lua')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user