From e7e7d289904afe0acae456effad908ae2617f949 Mon Sep 17 00:00:00 2001 From: Artem Dzhemesiuk Date: Sat, 20 May 2023 00:29:17 +0200 Subject: [PATCH] SDK update --- client/src/coreclr/CoreClr.cpp | 2 +- client/src/coreclr/CoreClr.h | 4 ++-- client/src/runtime/CSharpScriptRuntime.h | 2 +- cpp-sdk | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/coreclr/CoreClr.cpp b/client/src/coreclr/CoreClr.cpp index 6efe899..ce299aa 100644 --- a/client/src/coreclr/CoreClr.cpp +++ b/client/src/coreclr/CoreClr.cpp @@ -148,7 +148,7 @@ void CoreClr::Initialize(progressfn_t progress) { bool CoreClr::StartResource(alt::IResource* resource, alt::ICore* core) { if (!load_resource_delegate) { - Initialize([](alt::InitState state, float progress, float total) {}); + Initialize([](alt::InitState state, float progress, float total, int) {}); } const auto path = utils::string_to_wstring(resource->GetMain()); diff --git a/client/src/coreclr/CoreClr.h b/client/src/coreclr/CoreClr.h index 4d9ff21..9c15743 100644 --- a/client/src/coreclr/CoreClr.h +++ b/client/src/coreclr/CoreClr.h @@ -12,7 +12,7 @@ typedef int (* CoreClrDelegate_t)(void* args, int argsLength); -typedef std::function progressfn_t; +typedef std::function progressfn_t; struct Progress { @@ -23,7 +23,7 @@ struct Progress void Update() const { - updateFn(state, current, total); + updateFn(state, current, total, 1000); } void Advance(float value) diff --git a/client/src/runtime/CSharpScriptRuntime.h b/client/src/runtime/CSharpScriptRuntime.h index 4a1afce..5526642 100644 --- a/client/src/runtime/CSharpScriptRuntime.h +++ b/client/src/runtime/CSharpScriptRuntime.h @@ -8,7 +8,7 @@ class CSharpScriptRuntime : public alt::IScriptRuntime { alt::IResource::Impl * CreateImpl(alt::IResource *resource) override; void DestroyImpl(alt::IResource::Impl *impl) override; - void Init(std::function next, std::function setProgress) override; + void Init(std::function next, std::function setProgress) override; CoreClr clr; diff --git a/cpp-sdk b/cpp-sdk index 88261df..a568831 160000 --- a/cpp-sdk +++ b/cpp-sdk @@ -1 +1 @@ -Subproject commit 88261df615bdf55933a8b61fccb788ec9f1bec9d +Subproject commit a56883132b8d2d69b388cb53de2e97d1302ac31e