general: update
This commit is contained in:
parent
2991ee9b6f
commit
8d09d63606
1
.github/workflows/build.yml
vendored
1
.github/workflows/build.yml
vendored
@ -38,7 +38,6 @@ jobs:
|
|||||||
uses: microsoft/setup-msbuild@v1.1.3
|
uses: microsoft/setup-msbuild@v1.1.3
|
||||||
|
|
||||||
- name: Generate project files
|
- name: Generate project files
|
||||||
#run: tools/premake5 vs2022 --ci-build
|
|
||||||
run: tools/premake5 vs2022
|
run: tools/premake5 vs2022
|
||||||
|
|
||||||
- name: Set up problem matching
|
- name: Set up problem matching
|
||||||
|
@ -227,10 +227,12 @@ targetdir "%{wks.location}/bin/%{cfg.platform}/%{cfg.buildcfg}"
|
|||||||
|
|
||||||
configurations {"Debug", "Release"}
|
configurations {"Debug", "Release"}
|
||||||
|
|
||||||
architecture "x64"
|
language "C++"
|
||||||
|
cppdialect "C++20"
|
||||||
|
|
||||||
|
architecture "x86_64"
|
||||||
platforms "x64"
|
platforms "x64"
|
||||||
|
|
||||||
buildoptions "/std:c++latest"
|
|
||||||
systemversion "latest"
|
systemversion "latest"
|
||||||
symbols "On"
|
symbols "On"
|
||||||
staticruntime "On"
|
staticruntime "On"
|
||||||
@ -255,7 +257,7 @@ filter {}
|
|||||||
filter "configurations:Release"
|
filter "configurations:Release"
|
||||||
optimize "Size"
|
optimize "Size"
|
||||||
buildoptions {"/GL"}
|
buildoptions {"/GL"}
|
||||||
linkoptions { "/IGNORE:4702", "/LTCG" }
|
linkoptions {"/IGNORE:4702", "/LTCG"}
|
||||||
defines {"NDEBUG"}
|
defines {"NDEBUG"}
|
||||||
flags {"FatalCompileWarnings"}
|
flags {"FatalCompileWarnings"}
|
||||||
filter {}
|
filter {}
|
||||||
|
@ -86,15 +86,11 @@ namespace filesystem
|
|||||||
|
|
||||||
bool can_insert_path(const std::filesystem::path& path)
|
bool can_insert_path(const std::filesystem::path& path)
|
||||||
{
|
{
|
||||||
for (const auto& path_ : get_search_paths_internal())
|
const auto& paths = get_search_paths_internal();
|
||||||
|
return std::ranges::none_of(paths.cbegin(), paths.cend(), [path](const auto& elem)
|
||||||
{
|
{
|
||||||
if (path_ == path)
|
return elem == path;
|
||||||
{
|
});
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* sys_default_install_path_stub()
|
const char* sys_default_install_path_stub()
|
||||||
|
@ -50,9 +50,9 @@ namespace gsc
|
|||||||
std::unordered_map<scripting::script_function, unsigned int> functions;
|
std::unordered_map<scripting::script_function, unsigned int> functions;
|
||||||
std::optional<std::string> gsc_error;
|
std::optional<std::string> gsc_error;
|
||||||
|
|
||||||
char* allocate_buffer(size_t size)
|
char* allocate_buffer(std::uint32_t size)
|
||||||
{
|
{
|
||||||
return utils::hook::invoke<char*>(0x14061E680, size, 4, 1, 5);
|
return static_cast<char*>(game::PMem_AllocFromSource_NoDebug(size, 4, 1, 5));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool read_scriptfile(const std::string& name, std::string* data)
|
bool read_scriptfile(const std::string& name, std::string* data)
|
||||||
@ -135,7 +135,7 @@ namespace gsc
|
|||||||
const auto script_size = script.size();
|
const auto script_size = script.size();
|
||||||
const auto buffer_size = script_size + stack.size() + 2;
|
const auto buffer_size = script_size + stack.size() + 2;
|
||||||
|
|
||||||
const auto buffer = allocate_buffer(buffer_size);
|
const auto buffer = allocate_buffer(static_cast<std::uint32_t>(buffer_size));
|
||||||
std::memcpy(buffer, script.data(), script_size);
|
std::memcpy(buffer, script.data(), script_size);
|
||||||
std::memcpy(&buffer[script_size], stack.data(), stack.size());
|
std::memcpy(&buffer[script_size], stack.data(), stack.size());
|
||||||
|
|
||||||
|
@ -133,6 +133,8 @@ namespace game
|
|||||||
WEAK symbol<unsigned int(int handle, unsigned int paramcount)> Scr_ExecThread{0x1405C6F40};
|
WEAK symbol<unsigned int(int handle, unsigned int paramcount)> Scr_ExecThread{0x1405C6F40};
|
||||||
WEAK symbol<unsigned int(void* func, int type, unsigned int name)> Scr_RegisterFunction{0x1405BC7B0};
|
WEAK symbol<unsigned int(void* func, int type, unsigned int name)> Scr_RegisterFunction{0x1405BC7B0};
|
||||||
|
|
||||||
|
WEAK symbol<void*(unsigned int size, unsigned int alignment, unsigned int type, int source)> PMem_AllocFromSource_NoDebug{0x14061E680};
|
||||||
|
|
||||||
WEAK symbol<unsigned int(unsigned int localId, const char* pos, unsigned int paramcount)> VM_Execute{0x1405C8DB0};
|
WEAK symbol<unsigned int(unsigned int localId, const char* pos, unsigned int paramcount)> VM_Execute{0x1405C8DB0};
|
||||||
|
|
||||||
WEAK symbol<void(float x, float y, float width, float height, float s0, float t0, float s1, float t1,
|
WEAK symbol<void(float x, float y, float width, float height, float s0, float t0, float s1, float t1,
|
||||||
|
Binary file not shown.
BIN
tools/protoc.exe
BIN
tools/protoc.exe
Binary file not shown.
Loading…
Reference in New Issue
Block a user