Skip to content

Y
ygopro
Commit 73565591 authored by Chen Bill's avatar Chen Bill
Browse files
Options

Revert "use wcsncpy" 

This reverts commit b05e0c96.
parent 24de6bb2
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 18 deletions
gframe/gframe.cpp
View file @ 73565591
...@@ -115,16 +115,14 @@ int main(int argc, char* argv[]) { ...@@ -115,16 +115,14 @@ int main(int argc, char* argv[]) {
++i; ++i;
if(i < wargc) { if(i < wargc) {
deckCategorySpecified = true; deckCategorySpecified = true;
wcsncpy(ygo::mainGame->gameConf.lastcategory, wargv[i], sizeof ygo::mainGame->gameConf.lastcategory / sizeof ygo::mainGame->gameConf.lastcategory[0]); wcscpy(ygo::mainGame->gameConf.lastcategory, wargv[i]);
BufferIO::NullTerminate(ygo::mainGame->gameConf.lastcategory);
} }
} else if(!wcscmp(wargv[i], L"-d")) { // Deck } else if(!wcscmp(wargv[i], L"-d")) { // Deck
++i; ++i;
if(!deckCategorySpecified) if(!deckCategorySpecified)
ygo::mainGame->gameConf.lastcategory[0] = 0; ygo::mainGame->gameConf.lastcategory[0] = 0;
if(i + 1 < wargc) { // select deck if(i + 1 < wargc) { // select deck
wcsncpy(ygo::mainGame->gameConf.lastdeck, wargv[i], sizeof ygo::mainGame->gameConf.lastdeck / sizeof ygo::mainGame->gameConf.lastdeck[0]); wcscpy(ygo::mainGame->gameConf.lastdeck, wargv[i]);
BufferIO::NullTerminate(ygo::mainGame->gameConf.lastdeck);
continue; continue;
} else { // open deck } else { // open deck
exit_on_return = !keep_on_return; exit_on_return = !keep_on_return;
...@@ -137,8 +135,7 @@ int main(int argc, char* argv[]) { ...@@ -137,8 +135,7 @@ int main(int argc, char* argv[]) {
myswprintf(open_file_name, L"%ls/%ls", ygo::mainGame->gameConf.lastcategory, wargv[i]); myswprintf(open_file_name, L"%ls/%ls", ygo::mainGame->gameConf.lastcategory, wargv[i]);
#endif #endif
} else { } else {
wcsncpy(open_file_name, wargv[i], sizeof open_file_name / sizeof open_file_name[0]); wcscpy(open_file_name, wargv[i]);
BufferIO::NullTerminate(open_file_name);
} }
} }
ClickButton(ygo::mainGame->btnDeckEdit); ClickButton(ygo::mainGame->btnDeckEdit);
...@@ -159,8 +156,7 @@ int main(int argc, char* argv[]) { ...@@ -159,8 +156,7 @@ int main(int argc, char* argv[]) {
++i; ++i;
if(i < wargc) { if(i < wargc) {
open_file = true; open_file = true;
wcsncpy(open_file_name, wargv[i], sizeof open_file_name / sizeof open_file_name[0]); wcscpy(open_file_name, wargv[i]);
BufferIO::NullTerminate(open_file_name);
} }
ClickButton(ygo::mainGame->btnReplayMode); ClickButton(ygo::mainGame->btnReplayMode);
if(open_file) if(open_file)
...@@ -171,8 +167,7 @@ int main(int argc, char* argv[]) { ...@@ -171,8 +167,7 @@ int main(int argc, char* argv[]) {
++i; ++i;
if(i < wargc) { if(i < wargc) {
open_file = true; open_file = true;
wcsncpy(open_file_name, wargv[i], sizeof open_file_name / sizeof open_file_name[0]); wcscpy(open_file_name, wargv[i]);
BufferIO::NullTerminate(open_file_name);
} }
ClickButton(ygo::mainGame->btnSingleMode); ClickButton(ygo::mainGame->btnSingleMode);
if(open_file) if(open_file)
...@@ -182,16 +177,14 @@ int main(int argc, char* argv[]) { ...@@ -182,16 +177,14 @@ int main(int argc, char* argv[]) {
wchar_t* pstrext = wargv[1] + wcslen(wargv[1]) - 4; wchar_t* pstrext = wargv[1] + wcslen(wargv[1]) - 4;
if(!mywcsncasecmp(pstrext, L".ydk", 4)) { if(!mywcsncasecmp(pstrext, L".ydk", 4)) {
open_file = true; open_file = true;
wcsncpy(open_file_name, wargv[i], sizeof open_file_name / sizeof open_file_name[0]); wcscpy(open_file_name, wargv[i]);
BufferIO::NullTerminate(open_file_name);
exit_on_return = !keep_on_return; exit_on_return = !keep_on_return;
ClickButton(ygo::mainGame->btnDeckEdit); ClickButton(ygo::mainGame->btnDeckEdit);
break; break;
} }
if(!mywcsncasecmp(pstrext, L".yrp", 4)) { if(!mywcsncasecmp(pstrext, L".yrp", 4)) {
open_file = true; open_file = true;
wcsncpy(open_file_name, wargv[i], sizeof open_file_name / sizeof open_file_name[0]); wcscpy(open_file_name, wargv[i]);
BufferIO::NullTerminate(open_file_name);
exit_on_return = !keep_on_return; exit_on_return = !keep_on_return;
ClickButton(ygo::mainGame->btnReplayMode); ClickButton(ygo::mainGame->btnReplayMode);
ClickButton(ygo::mainGame->btnLoadReplay); ClickButton(ygo::mainGame->btnLoadReplay);
......
gframe/menu_handler.cpp
View file @ 73565591
...@@ -448,8 +448,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -448,8 +448,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
wcsncpy(deck_name, dash + 1, 256); wcsncpy(deck_name, dash + 1, 256);
for(size_t i = 0; i < mainGame->cbDBDecks->getItemCount(); ++i) { for(size_t i = 0; i < mainGame->cbDBDecks->getItemCount(); ++i) {
if(!wcscmp(mainGame->cbDBDecks->getItem(i), deck_name)) { if(!wcscmp(mainGame->cbDBDecks->getItem(i), deck_name)) {
wcsncpy(mainGame->gameConf.lastdeck, deck_name, sizeof mainGame->gameConf.lastdeck / sizeof mainGame->gameConf.lastdeck[0]); wcscpy(mainGame->gameConf.lastdeck, deck_name);
BufferIO::NullTerminate(mainGame->gameConf.lastdeck);
mainGame->cbDBDecks->setSelected(i); mainGame->cbDBDecks->setSelected(i);
break; break;
} }
...@@ -457,8 +456,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -457,8 +456,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
} else { // only deck name } else { // only deck name
for(size_t i = 0; i < mainGame->cbDBDecks->getItemCount(); ++i) { for(size_t i = 0; i < mainGame->cbDBDecks->getItemCount(); ++i) {
if(!wcscmp(mainGame->cbDBDecks->getItem(i), open_file_name)) { if(!wcscmp(mainGame->cbDBDecks->getItem(i), open_file_name)) {
wcsncpy(mainGame->gameConf.lastdeck, open_file_name, sizeof mainGame->gameConf.lastdeck / sizeof mainGame->gameConf.lastdeck[0]); wcscpy(mainGame->gameConf.lastdeck, open_file_name);
BufferIO::NullTerminate(mainGame->gameConf.lastdeck);
mainGame->cbDBDecks->setSelected(i); mainGame->cbDBDecks->setSelected(i);
break; break;
} }
......
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