Skip to content

Y
ygopro
Commit 526bd1aa authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'next' into develop

parents 5c56a92e 7958d8cf
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
gframe/data_manager.cpp
View file @ 526bd1aa
...@@ -59,7 +59,7 @@ bool DataManager::LoadDB(const wchar_t* wfile) { ...@@ -59,7 +59,7 @@ bool DataManager::LoadDB(const wchar_t* wfile) {
if (len > SIZE_SETCODE) if (len > SIZE_SETCODE)
len = SIZE_SETCODE; len = SIZE_SETCODE;
if (len) if (len)
std::memcpy(cd.setcode, it->second.data(), len * sizeof(uint16_t)); memcpy(cd.setcode, it->second.data(), len * sizeof(uint16_t));
} }
else else
cd.set_setcode(sqlite3_column_int64(pStmt, 3)); cd.set_setcode(sqlite3_column_int64(pStmt, 3));
...@@ -175,7 +175,7 @@ bool DataManager::GetData(unsigned int code, CardData* pData) { ...@@ -175,7 +175,7 @@ bool DataManager::GetData(unsigned int code, CardData* pData) {
if (pData) { if (pData) {
pData->code = data.code; pData->code = data.code;
pData->alias = data.alias; pData->alias = data.alias;
std::memcpy(pData->setcode, data.setcode, SIZE_SETCODE); memcpy(pData->setcode, data.setcode, SIZE_SETCODE);
pData->type = data.type; pData->type = data.type;
pData->level = data.level; pData->level = data.level;
pData->attribute = data.attribute; pData->attribute = data.attribute;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment