Skip to content

Add engineStreamingFreeUpMemory #2268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 3, 2021
Merged

Add engineStreamingFreeUpMemory #2268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26a5d32
Add engineStreamingFreeUpMemory
Pirulax Jun 18, 2021
469e499
Fix wrong call address
Pirulax Aug 2, 2021
cd9eed3
Update Client/game_sa/CStreamingSA.cpp
botder Aug 3, 2021
efc34d6
Merge branch 'master' into feature/engineStreamingFreeUpMemory
botder Aug 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Client/game_sa/CStreamingSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@ void CStreamingSA::ReinitStreaming()
reinitStreaming();
}

void CStreamingSA::MakeSpaceFor(std::uint32_t memoryToCleanInBytes)
{
(reinterpret_cast<void(__cdecl*)(std::uint32_t)>(0x40E120))(memoryToCleanInBytes);
}

std::uint32_t CStreamingSA::GetMemoryUsed() const
{
return *reinterpret_cast<std::uint32_t*>(0x8E4CB4);
Expand Down
1 change: 1 addition & 0 deletions Client/game_sa/CStreamingSA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class CStreamingSA : public CStreaming
void RequestSpecialModel(DWORD model, const char* szTexture, DWORD channel);
void ReinitStreaming();
CStreamingInfo* GetStreamingInfoFromModelId(uint32 id);
void MakeSpaceFor(std::uint32_t memoryToCleanInBytes) override;
std::uint32_t GetMemoryUsed() const override;

private:
Expand Down
7 changes: 6 additions & 1 deletion Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
#include "StdInc.h"
#include <lua/CLuaFunctionParser.h>

void EngineStreamingFreeUpMemory(std::uint32_t bytes)
{
g_pGame->GetStreaming()->MakeSpaceFor(bytes);
}

std::uint32_t EngineStreamingGetUsedMemory()
{
return g_pGame->GetStreaming()->GetMemoryUsed();
Expand Down Expand Up @@ -56,7 +61,7 @@ void CLuaEngineDefs::LoadFunctions()
{"engineGetObjectGroupPhysicalProperty", EngineGetObjectGroupPhysicalProperty},
{"engineRestoreObjectGroupPhysicalProperties", EngineRestoreObjectGroupPhysicalProperties},
{"engineRestreamWorld", ArgumentParser<EngineRestreamWorld>},

{"engineStreamingFreeUpMemory", ArgumentParser<EngineStreamingFreeUpMemory>},
{"engineStreamingGetUsedMemory", ArgumentParser<EngineStreamingGetUsedMemory>},

// CLuaCFunctions::AddFunction ( "engineReplaceMatchingAtomics", EngineReplaceMatchingAtomics );
Expand Down
1 change: 1 addition & 0 deletions Client/sdk/game/CStreaming.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@ class CStreaming
virtual void RequestSpecialModel(DWORD model, const char* szTexture, DWORD channel) = 0;
virtual CStreamingInfo* GetStreamingInfoFromModelId(uint32 id) = 0;
virtual void ReinitStreaming() = 0;
virtual void MakeSpaceFor(std::uint32_t memoryToCleanInBytes) = 0;
virtual std::uint32_t GetMemoryUsed() const = 0;
};