diff options
author | LaG1924 <lag1924@gmail.com> | 2021-06-22 01:40:04 +0200 |
---|---|---|
committer | LaG1924 <lag1924@gmail.com> | 2021-06-22 02:20:33 +0200 |
commit | 0d2b4783824730ba2208f5caaef27c5c61a56fa5 (patch) | |
tree | 3c2e085706f3824aa34d2dce5747c9c86a79723a /src | |
parent | Added Settings UI (diff) | |
download | AltCraft-0d2b4783824730ba2208f5caaef27c5c61a56fa5.tar AltCraft-0d2b4783824730ba2208f5caaef27c5c61a56fa5.tar.gz AltCraft-0d2b4783824730ba2208f5caaef27c5c61a56fa5.tar.bz2 AltCraft-0d2b4783824730ba2208f5caaef27c5c61a56fa5.tar.lz AltCraft-0d2b4783824730ba2208f5caaef27c5c61a56fa5.tar.xz AltCraft-0d2b4783824730ba2208f5caaef27c5c61a56fa5.tar.zst AltCraft-0d2b4783824730ba2208f5caaef27c5c61a56fa5.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/Plugin.cpp | 6 | ||||
-rw-r--r-- | src/Rml.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Plugin.cpp b/src/Plugin.cpp index e3188e6..5134aa6 100644 --- a/src/Plugin.cpp +++ b/src/Plugin.cpp @@ -237,6 +237,11 @@ void PluginSystem::Init() { "name", &Dimension::name, "skylight", &Dimension::skylight); + lua.new_usertype<LoopExecutionTimeController>("LoopExecutionTimeController", + "GetIterations", &LoopExecutionTimeController::GetIterations, + "GetDeltaS", &LoopExecutionTimeController::GetDeltaS, + "GetRealDeltaS", &LoopExecutionTimeController::GetRealDeltaS); + sol::table apiTable = lua["AC"].get_or_create<sol::table>(); sol::table apiSettings = lua["AC"]["Settings"].get_or_create<sol::table>(); @@ -262,6 +267,7 @@ void PluginSystem::Init() { apiSettings["ReadDouble"] = Settings::ReadDouble; apiSettings["WriteDouble"] = Settings::WriteDouble; apiTable["SettingsUpdate"] = PluginApi::SettingsUpdate; + apiTable["GetTime"] = GetTime; } lua_State* PluginSystem::GetLuaState() { diff --git a/src/Rml.cpp b/src/Rml.cpp index cbc795f..6ed83c1 100644 --- a/src/Rml.cpp +++ b/src/Rml.cpp @@ -189,7 +189,7 @@ void RmlFileInterface::Close(Rml::FileHandle file) { size_t RmlFileInterface::Read(void* buffer, size_t size, Rml::FileHandle file) { size_t readed = 0; - readed = _min(handles[file].assetPtr->data.size() - handles[file].filePos, size); + readed = _min((size_t)(handles[file].assetPtr->data.size() - handles[file].filePos), size); std::memcpy(buffer, handles[file].assetPtr->data.data() + handles[file].filePos, readed); handles[file].filePos += readed; return readed; |