diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-01-22 23:03:12 +0100 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-22 23:03:12 +0100 |
commit | c884edd923a20e2fdf697bb7101039c812c6db25 (patch) | |
tree | a5352c5ef5e7f7359af907428d3fc23c653e5357 | |
parent | fix (diff) | |
download | re3-c884edd923a20e2fdf697bb7101039c812c6db25.tar re3-c884edd923a20e2fdf697bb7101039c812c6db25.tar.gz re3-c884edd923a20e2fdf697bb7101039c812c6db25.tar.bz2 re3-c884edd923a20e2fdf697bb7101039c812c6db25.tar.lz re3-c884edd923a20e2fdf697bb7101039c812c6db25.tar.xz re3-c884edd923a20e2fdf697bb7101039c812c6db25.tar.zst re3-c884edd923a20e2fdf697bb7101039c812c6db25.zip |
-rw-r--r-- | premake5.lua | 2 | ||||
-rw-r--r-- | src/control/Script.cpp | 5 | ||||
-rw-r--r-- | src/leeds/smallHeap.cpp | 20 | ||||
-rw-r--r-- | src/leeds/smallHeap.h | 17 |
4 files changed, 42 insertions, 2 deletions
diff --git a/premake5.lua b/premake5.lua index 2fe5cc97..2a8e6c93 100644 --- a/premake5.lua +++ b/premake5.lua @@ -242,6 +242,7 @@ project "reLCS" files { addSrcFiles("src/control") } files { addSrcFiles("src/core") } files { addSrcFiles("src/entities") } + files { addSrcFiles("src/leeds") } files { addSrcFiles("src/leeds/base") } files { addSrcFiles("src/math") } files { addSrcFiles("src/modelinfo") } @@ -267,6 +268,7 @@ project "reLCS" includedirs { "src/control" } includedirs { "src/core" } includedirs { "src/entities" } + includedirs { "src/leeds" } includedirs { "src/leeds/base" } includedirs { "src/math" } includedirs { "src/modelinfo" } diff --git a/src/control/Script.cpp b/src/control/Script.cpp index a9df5799..ca94527f 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -49,7 +49,7 @@ #include "Timecycle.h" #include "TxdStore.h" #include "Bike.h" -#include "memoryManager.h" +#include "smallHeap.h" #ifdef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT #include <stdarg.h> #endif @@ -2632,7 +2632,8 @@ bool CTheScripts::Init(bool loaddata) CFileMgr::Read(mainf, (char*)&MainScriptSize, sizeof(MainScriptSize)); int nLargestMissionSize = 0; CFileMgr::Read(mainf, (char*)&nLargestMissionSize, sizeof(nLargestMissionSize)); - // some cSmallHeap shit - TODO + if (!cSmallHeap::msInstance.IsLocked()) + cSmallHeap::msInstance.Lock(); ScriptSpace = (uint8*)base::cMainMemoryManager::Instance()->Allocate(MainScriptSize + nLargestMissionSize); memset(ScriptSpace, 0, MainScriptSize + nLargestMissionSize); CFileMgr::Read(mainf, (char*)ScriptSpace, MainScriptSize); diff --git a/src/leeds/smallHeap.cpp b/src/leeds/smallHeap.cpp new file mode 100644 index 00000000..262113af --- /dev/null +++ b/src/leeds/smallHeap.cpp @@ -0,0 +1,20 @@ +#include "common.h" +#include "smallHeap.h" + +cSmallHeap cSmallHeap::msInstance; + +cSmallHeap::cSmallHeap() +{ + bLocked = false; + bUnk = false; +} + +void cSmallHeap::Lock() +{ + // TODO: PS2 code +} + +void cSmallHeap::Unlock() +{ + // TODO: PS2 code +}
\ No newline at end of file diff --git a/src/leeds/smallHeap.h b/src/leeds/smallHeap.h new file mode 100644 index 00000000..f2897688 --- /dev/null +++ b/src/leeds/smallHeap.h @@ -0,0 +1,17 @@ +#pragma once + +#include "memoryManager.h" + +class cSmallHeap : public base::cMemoryManager +{ + bool bLocked; + bool bUnk; +public: + cSmallHeap(); + void Lock(); + void Unlock(); + + bool IsLocked() const { return bLocked; } + + static cSmallHeap msInstance; +};
\ No newline at end of file |