R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Light cleanup

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-09-09 02:28:03 +02:00
parent 570f6419df
commit b6ff2c8798
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/public/iframetask.h
View File

@ -1,11 +1,11 @@
#ifndef TIER0_IFRAMETASK_H
#define TIER0_IFRAMETASK_H
struct DelayedCall_s
struct ScheduledTasks_s
{
int m_nDelayedFrames;
std::function<void()> m_rFunctor;
DelayedCall_s(int frames, std::function<void()> functor)
ScheduledTasks_s(int frames, std::function<void()> functor)
{
m_nDelayedFrames = frames;
m_rFunctor = functor;

8
r5dev/tier0/frametask.cpp
View File

@ -14,7 +14,7 @@
void CFrameTask::RunFrame()
{
std::lock_guard<std::mutex> l(m_Mutex);
for (auto& delay : m_DelayedCalls)
for (auto& delay : m_ScheduledTasks)
{
delay.m_nDelayedFrames = (std::max)(delay.m_nDelayedFrames - 1, 0);
if (delay.m_nDelayedFrames == 0)
@ -23,11 +23,11 @@ void CFrameTask::RunFrame()
}
}
auto newEnd = std::remove_if(m_DelayedCalls.begin(), m_DelayedCalls.end(), [](const DelayedCall_s& delay)
auto newEnd = std::remove_if(m_ScheduledTasks.begin(), m_ScheduledTasks.end(), [](const ScheduledTasks_s& delay)
{
return delay.m_nDelayedFrames == 0;
});
m_DelayedCalls.erase(newEnd, m_DelayedCalls.end());
m_ScheduledTasks.erase(newEnd, m_ScheduledTasks.end());
}
//-----------------------------------------------------------------------------
@ -47,7 +47,7 @@ bool CFrameTask::IsFinished() const
void CFrameTask::Dispatch(std::function<void()> functor, int frames)
{
std::lock_guard<std::mutex> l(m_Mutex);
m_DelayedCalls.emplace_back(frames, functor);
m_ScheduledTasks.emplace_back(frames, functor);
}
//-----------------------------------------------------------------------------

2
r5dev/tier0/frametask.h
View File

@ -21,7 +21,7 @@ public:
private:
mutable std::mutex m_Mutex;
std::list<DelayedCall_s> m_DelayedCalls;
std::list<ScheduledTasks_s> m_ScheduledTasks;
};
extern std::list<IFrameTask*> g_FrameTasks;

2
r5dev/vpklib/packedstore.cpp
View File

@ -657,7 +657,7 @@ VPKEntryBlock_t::VPKEntryBlock_t(CIOStream* pReader, string svEntryPath)
//-----------------------------------------------------------------------------
VPKEntryBlock_t::VPKEntryBlock_t(const vector<uint8_t> &vData, int64_t nOffset, uint16_t nPreloadSize, uint16_t nArchiveIndex, uint32_t nLoadFlags, uint16_t nTextureFlags, const string& svEntryPath)
{
m_nFileCRC = crc32::update(m_nFileCRC, vData.data(), vData.size());
m_nFileCRC = crc32::update(NULL, vData.data(), vData.size());
m_iPreloadSize = nPreloadSize;
m_iPackFileIndex = nArchiveIndex;
m_svEntryPath = svEntryPath;