ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use 0, NULL and nullptr correctly

This commit is contained in:
PatrickvL 2017-04-21 16:21:42 +02:00 committed by Luke Usher
parent ced5963a3a
commit f615a900af
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp
View File

@ -855,10 +855,10 @@ bool XTL::VertexPatcher::PatchPrimitive(VertexPatchDesc *pPatchDesc,
DWORD dwNewSizeWR = 0; DWORD dwNewSizeWR = 0;
// vertex data arrays // vertex data arrays
BYTE *pOrigVertexData = 0; BYTE *pOrigVertexData = nullptr;
BYTE *pPatchedVertexData = 0; BYTE *pPatchedVertexData = nullptr;
if(pPatchDesc->pVertexStreamZeroData == 0) if(pPatchDesc->pVertexStreamZeroData == nullptr)
{ {
g_pD3DDevice8->GetStreamSource(0, &pStream->pOriginalStream, &pStream->uiOrigStride); g_pD3DDevice8->GetStreamSource(0, &pStream->pOriginalStream, &pStream->uiOrigStride);
pStream->uiNewStride = pStream->uiOrigStride; // The stride is still the same pStream->uiNewStride = pStream->uiOrigStride; // The stride is still the same
@ -887,7 +887,7 @@ bool XTL::VertexPatcher::PatchPrimitive(VertexPatchDesc *pPatchDesc,
dwNewSize = pPatchDesc->dwPrimitiveCount * pStream->uiOrigStride + pStream->uiOrigStride; dwNewSize = pPatchDesc->dwPrimitiveCount * pStream->uiOrigStride + pStream->uiOrigStride;
} }
if(pPatchDesc->pVertexStreamZeroData == 0) if(pPatchDesc->pVertexStreamZeroData == nullptr)
{ {
// Retrieve the original buffer size // Retrieve the original buffer size
{ {
@ -990,7 +990,7 @@ bool XTL::VertexPatcher::PatchPrimitive(VertexPatchDesc *pPatchDesc,
memcpy(&pPatchedVertexData[pPatchDesc->dwOffset + dwOriginalSize], &pOrigVertexData[pPatchDesc->dwOffset], pStream->uiOrigStride); memcpy(&pPatchedVertexData[pPatchDesc->dwOffset + dwOriginalSize], &pOrigVertexData[pPatchDesc->dwOffset], pStream->uiOrigStride);
} }
if(pPatchDesc->pVertexStreamZeroData == 0) if(pPatchDesc->pVertexStreamZeroData == nullptr)
{ {
pStream->pOriginalStream->Unlock(); pStream->pOriginalStream->Unlock();
pStream->pPatchedStream->Unlock(); pStream->pPatchedStream->Unlock();