Added support for CLion, removed a lot of unused code in preparation of the rewriting of the network stack
This commit is contained in:
@ -124,7 +124,7 @@ CAttribute::CAttribute(DWORD * attr, DWORD width, DWORD height) // attr
|
||||
Alloc();
|
||||
|
||||
if (dataType == D_DWORD) // D_DWORD<52><44> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ӽ<EFBFBD><D3BC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>.
|
||||
thecore_memcpy(data, attr, sizeof(DWORD) * width * height);
|
||||
memcpy(data, attr, sizeof(DWORD) * width * height);
|
||||
else
|
||||
{
|
||||
// <20>ƴϸ<C6B4> <20><><EFBFBD><EFBFBD>Ʈ <20>ؾ<EFBFBD> <20>Ѵ<EFBFBD>.
|
||||
@ -245,7 +245,7 @@ void CAttribute::CopyRow(DWORD y, DWORD * row)
|
||||
}
|
||||
|
||||
if (dwordPtr)
|
||||
thecore_memcpy(row, dwordPtr[y], sizeof(DWORD) * width);
|
||||
memcpy(row, dwordPtr[y], sizeof(DWORD) * width);
|
||||
else
|
||||
{
|
||||
if (bytePtr)
|
||||
|
@ -1,6 +1,5 @@
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include "../../libthecore/include/memcpy.h"
|
||||
#include <common/stl.h>
|
||||
#include "grid.h"
|
||||
|
||||
@ -14,7 +13,7 @@ CGrid::CGrid(CGrid * pkGrid, int w, int h) : m_iWidth(w), m_iHeight(h)
|
||||
{
|
||||
m_pGrid = new char[m_iWidth * m_iHeight];
|
||||
int iSize = std::MIN(w * h, pkGrid->m_iWidth * pkGrid->m_iHeight);
|
||||
thecore_memcpy(m_pGrid, pkGrid->m_pGrid, sizeof(char) * iSize);
|
||||
memcpy(m_pGrid, pkGrid->m_pGrid, sizeof(char) * iSize);
|
||||
}
|
||||
|
||||
CGrid::~CGrid()
|
||||
|
Reference in New Issue
Block a user