From 9e8acac783f41cb57ab0149c6bf86d2bf4def34c Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 1 Aug 2025 22:00:29 +0300 Subject: [PATCH] minor refactor --- res/scripts/stdlib.lua | 6 +++--- src/logic/BlocksController.cpp | 2 +- src/logic/scripting/scripting.cpp | 5 +++-- src/logic/scripting/scripting.hpp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/res/scripts/stdlib.lua b/res/scripts/stdlib.lua index 6202a445..b0fb86ea 100644 --- a/res/scripts/stdlib.lua +++ b/res/scripts/stdlib.lua @@ -510,8 +510,8 @@ function __vc_on_world_open() end end -function __vc_on_world_tick() - time.schedules.world:tick(1.0 / 20.0) +function __vc_on_world_tick(tps) + time.schedules.world:tick(1.0 / tps) end function __vc_on_world_save() @@ -683,4 +683,4 @@ function dofile(path) end end return _dofile(path) -end \ No newline at end of file +end diff --git a/src/logic/BlocksController.cpp b/src/logic/BlocksController.cpp index cdc25b48..ee74bb95 100644 --- a/src/logic/BlocksController.cpp +++ b/src/logic/BlocksController.cpp @@ -127,7 +127,7 @@ void BlocksController::update(float delta, uint padding) { onBlocksTick(blocksTickClock.getPart(), blocksTickClock.getParts()); } if (worldTickClock.update(delta)) { - scripting::on_world_tick(); + scripting::on_world_tick(worldTickClock.getTickRate()); } } diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index 5da5b3ba..39168843 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -297,10 +297,11 @@ void scripting::on_world_load(LevelController* controller) { } } -void scripting::on_world_tick() { +void scripting::on_world_tick(int tps) { auto L = lua::get_main_state(); if (lua::getglobal(L, "__vc_on_world_tick")) { - lua::call_nothrow(L, 0, 0); + lua::pushinteger(L, tps); + lua::call_nothrow(L, 1, 0); } for (auto& pack : content_control->getAllContentPacks()) { lua::emit_event(L, pack.id + ":.worldtick"); diff --git a/src/logic/scripting/scripting.hpp b/src/logic/scripting/scripting.hpp index 0f375746..bae5aac6 100644 --- a/src/logic/scripting/scripting.hpp +++ b/src/logic/scripting/scripting.hpp @@ -70,7 +70,7 @@ namespace scripting { ); void on_world_load(LevelController* controller); - void on_world_tick(); + void on_world_tick(int tps); void on_world_save(); void on_world_quit(); void cleanup();