tiberium/CNC_TS_and_RA2_Mission_Editor
1
0
Fork 0
mirror of https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git synced 2025-05-06 11:41:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

renamed inner variable of SHP image blend queue

Browse source
This commit is contained in:
Zero Fanker 2024-05-19 11:39:40 -04:00
parent 7962824be7
commit c94515c686
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
MissionEditor/Loading.cpp
View file

@ -558,7 +558,7 @@ void CLoading::UnionSHP_GetAndClear(unsigned char*& pOutBuffer, int* OutWidth, i
// never calls it when UnionSHP_Data is empty
if (UnionSHP_Data[UseTemp].size() == 1) {
pOutBuffer = UnionSHP_Data[UseTemp][0].pBuffer;
pOutBuffer = UnionSHP_Data[UseTemp][0].Buffer;
*OutWidth = UnionSHP_Data[UseTemp][0].Width;
*OutHeight = UnionSHP_Data[UseTemp][0].Height;
UnionSHP_Data[UseTemp].clear();
@ -593,10 +593,10 @@ void CLoading::UnionSHP_GetAndClear(unsigned char*& pOutBuffer, int* OutWidth, i
for (int j = 0; j < data.Height; ++j)
for (int i = 0; i < data.Width; ++i)
if (auto nPalIdx = data.pBuffer[j * data.Width + i])
if (auto nPalIdx = data.Buffer[j * data.Width + i])
pOutBuffer[(nStartY + j) * W + nStartX + i] = nPalIdx;
delete[](data.pBuffer);
delete[](data.Buffer);
}
UnionSHP_Data[UseTemp].clear();

2
MissionEditor/Loading.h
View file

@ -229,7 +229,7 @@ private:
struct SHPUnionData
{
unsigned char* pBuffer;
unsigned char* Buffer;// This buffer allocated from outside
int Width;
int Height;
int DeltaX;