Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 02b8469

Browse files
committed
Rename m_NetworkBitmapIsLocked to m_NetworkBitmapLock
1 parent b995b9a commit 02b8469

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Managers/FrameMan.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -861,14 +861,14 @@ namespace RTE {
861861

862862
// Replace 8 bit backbuffer contents with network received image before post-processing as it is where this buffer is copied to 32 bit buffer
863863
if (GetDrawNetworkBackBuffer()) {
864-
m_NetworkBitmapIsLocked[0].lock();
864+
m_NetworkBitmapLock[0].lock();
865865

866866
blit(m_NetworkBackBufferFinal8[m_NetworkFrameReady][0], m_BackBuffer8, 0, 0, 0, 0, m_BackBuffer8->w, m_BackBuffer8->h);
867867
masked_blit(m_NetworkBackBufferFinalGUI8[m_NetworkFrameReady][0], m_BackBuffer8, 0, 0, 0, 0, m_BackBuffer8->w, m_BackBuffer8->h);
868868

869869
if (g_UInputMan.FlagAltState() || g_UInputMan.FlagCtrlState() || g_UInputMan.FlagShiftState()) { g_PerformanceMan.DrawCurrentPing(); }
870870

871-
m_NetworkBitmapIsLocked[0].unlock();
871+
m_NetworkBitmapLock[0].unlock();
872872
}
873873
}
874874

@@ -1019,10 +1019,10 @@ namespace RTE {
10191019
dx = (i == 1 || i == 3) ? dw : dx;
10201020
dy = (i == 2 || i == 3) ? dh : dy;
10211021

1022-
m_NetworkBitmapIsLocked[i].lock();
1022+
m_NetworkBitmapLock[i].lock();
10231023
blit(m_NetworkBackBufferIntermediate8[m_NetworkFrameCurrent][i], m_NetworkBackBufferFinal8[m_NetworkFrameCurrent][i], 0, 0, 0, 0, m_NetworkBackBufferFinal8[m_NetworkFrameCurrent][i]->w, m_NetworkBackBufferFinal8[m_NetworkFrameCurrent][i]->h);
10241024
blit(m_NetworkBackBufferIntermediateGUI8[m_NetworkFrameCurrent][i], m_NetworkBackBufferFinalGUI8[m_NetworkFrameCurrent][i], 0, 0, 0, 0, m_NetworkBackBufferFinalGUI8[m_NetworkFrameCurrent][i]->w, m_NetworkBackBufferFinalGUI8[m_NetworkFrameCurrent][i]->h);
1025-
m_NetworkBitmapIsLocked[i].unlock();
1025+
m_NetworkBitmapLock[i].unlock();
10261026

10271027
#if defined DEBUG_BUILD || defined MIN_DEBUG_BUILD
10281028
// Draw all player's screen into one

Managers/FrameMan.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ namespace RTE {
616616
unsigned short m_NetworkFrameCurrent; //!< Which frame index is being rendered, 0 or 1.
617617
unsigned short m_NetworkFrameReady; //!< Which frame is rendered and ready for transmission, 0 or 1.
618618

619-
std::mutex m_NetworkBitmapIsLocked[c_MaxScreenCount]; //!< Mutex lock for thread safe updating of the network backbuffer bitmaps.
619+
std::mutex m_NetworkBitmapLock[c_MaxScreenCount]; //!< Mutex lock for thread safe updating of the network backbuffer bitmaps.
620620

621621
private:
622622

0 commit comments

Comments
 (0)