Skip to content

Y
ygopro
Commit 49977194 authored by mercury233's avatar mercury233
Browse files
Options

format

parent 9dbad8a6
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 24 deletions
gframe/deck_con.cpp
View file @ 49977194
...@@ -346,7 +346,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -346,7 +346,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
int catesel = mainGame->lstCategories->getSelected(); int catesel = mainGame->lstCategories->getSelected();
if(catesel != 2) if(catesel != 2)
mainGame->cbDMCategory->addItem(dataManager.GetSysString(1452)); mainGame->cbDMCategory->addItem(dataManager.GetSysString(1452));
for(int i = 4;i < mainGame->lstCategories->getItemCount();i++) { for(int i = 4; i < mainGame->lstCategories->getItemCount(); i++) {
if(i != catesel) if(i != catesel)
mainGame->cbDMCategory->addItem(mainGame->lstCategories->getListItem(i)); mainGame->cbDMCategory->addItem(mainGame->lstCategories->getListItem(i));
} }
...@@ -363,7 +363,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -363,7 +363,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
int catesel = mainGame->lstCategories->getSelected(); int catesel = mainGame->lstCategories->getSelected();
if(catesel != 2) if(catesel != 2)
mainGame->cbDMCategory->addItem(dataManager.GetSysString(1452)); mainGame->cbDMCategory->addItem(dataManager.GetSysString(1452));
for(int i = 4;i < mainGame->lstCategories->getItemCount();i++) { for(int i = 4; i < mainGame->lstCategories->getItemCount(); i++) {
if(i != catesel) if(i != catesel)
mainGame->cbDMCategory->addItem(mainGame->lstCategories->getListItem(i)); mainGame->cbDMCategory->addItem(mainGame->lstCategories->getListItem(i));
} }
...@@ -381,9 +381,8 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -381,9 +381,8 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame->cbDBCategory->addItem(catename); mainGame->cbDBCategory->addItem(catename);
mainGame->lstCategories->addItem(catename); mainGame->lstCategories->addItem(catename);
catesel = mainGame->lstCategories->getItemCount() - 1; catesel = mainGame->lstCategories->getItemCount() - 1;
} } else {
else { for(int i = 3; i < mainGame->lstCategories->getItemCount(); i++) {
for(int i = 3;i < mainGame->lstCategories->getItemCount();i++) {
if(!mywcsncasecmp(mainGame->lstCategories->getListItem(i), catename, 256)) { if(!mywcsncasecmp(mainGame->lstCategories->getListItem(i), catename, 256)) {
catesel = i; catesel = i;
mainGame->stACMessage->setText(dataManager.GetSysString(1474)); mainGame->stACMessage->setText(dataManager.GetSysString(1474));
...@@ -413,7 +412,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -413,7 +412,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
catesel = mainGame->lstCategories->getItemCount() - 1; catesel = mainGame->lstCategories->getItemCount() - 1;
} else { } else {
catesel = 0; catesel = 0;
for(int i = 3;i < mainGame->lstCategories->getItemCount();i++) { for(int i = 3; i < mainGame->lstCategories->getItemCount(); i++) {
if(!mywcsncasecmp(mainGame->lstCategories->getListItem(i), newcatename, 256)) { if(!mywcsncasecmp(mainGame->lstCategories->getListItem(i), newcatename, 256)) {
catesel = i; catesel = i;
mainGame->stACMessage->setText(dataManager.GetSysString(1474)); mainGame->stACMessage->setText(dataManager.GetSysString(1474));
...@@ -444,8 +443,8 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -444,8 +443,8 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame->cbDBCategory->setSelected(catesel); mainGame->cbDBCategory->setSelected(catesel);
ChangeCategory(catesel); ChangeCategory(catesel);
} else { } else {
mainGame->stACMessage->setText(dataManager.GetSysString(1476)); mainGame->stACMessage->setText(dataManager.GetSysString(1476));
mainGame->PopupElement(mainGame->wACMessage, 20); mainGame->PopupElement(mainGame->wACMessage, 20);
} }
break; break;
} }
...@@ -464,7 +463,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -464,7 +463,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
RefreshDeckList(); RefreshDeckList();
ChangeCategory(mainGame->lstCategories->getSelected()); ChangeCategory(mainGame->lstCategories->getSelected());
} }
for(int i = 0;i < mainGame->lstDecks->getItemCount();i++) { for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) {
if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) { if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) {
deckManager.LoadDeck(filepath); deckManager.LoadDeck(filepath);
prev_deck = i; prev_deck = i;
...@@ -498,7 +497,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -498,7 +497,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
} }
RefreshDeckList(); RefreshDeckList();
ChangeCategory(catesel); ChangeCategory(catesel);
for(int i = 0;i < mainGame->lstDecks->getItemCount();i++) { for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) {
if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), newdeckname, 256)) { if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), newdeckname, 256)) {
deckManager.LoadDeck(newfilepath); deckManager.LoadDeck(newfilepath);
prev_deck = i; prev_deck = i;
...@@ -562,7 +561,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -562,7 +561,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
RefreshDeckList(); RefreshDeckList();
mainGame->cbDBCategory->setSelected(catesel); mainGame->cbDBCategory->setSelected(catesel);
ChangeCategory(catesel); ChangeCategory(catesel);
for(int i = 0;i < mainGame->lstDecks->getItemCount();i++) { for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) {
if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) { if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) {
deckManager.LoadDeck(newfilepath); deckManager.LoadDeck(newfilepath);
prev_deck = i; prev_deck = i;
...@@ -600,7 +599,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -600,7 +599,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
RefreshDeckList(); RefreshDeckList();
mainGame->cbDBCategory->setSelected(catesel); mainGame->cbDBCategory->setSelected(catesel);
ChangeCategory(catesel); ChangeCategory(catesel);
for(int i = 0;i < mainGame->lstDecks->getItemCount();i++) { for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) {
if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) { if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) {
deckManager.LoadDeck(newfilepath); deckManager.LoadDeck(newfilepath);
prev_deck = i; prev_deck = i;
...@@ -633,8 +632,9 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -633,8 +632,9 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break; break;
} }
case BUTTON_SIDE_OK: { case BUTTON_SIDE_OK: {
if(deckManager.current_deck.main.size() != pre_mainc || deckManager.current_deck.extra.size() != pre_extrac if(deckManager.current_deck.main.size() != pre_mainc
|| deckManager.current_deck.side.size() != pre_sidec) { || deckManager.current_deck.extra.size() != pre_extrac
|| deckManager.current_deck.side.size() != pre_sidec) {
soundManager.PlaySoundEffect(SOUND_INFO); soundManager.PlaySoundEffect(SOUND_INFO);
mainGame->env->addMessageBox(L"", dataManager.GetSysString(1410)); mainGame->env->addMessageBox(L"", dataManager.GetSysString(1410));
break; break;
...@@ -727,8 +727,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -727,8 +727,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame->HideElement(mainGame->wQuery); mainGame->HideElement(mainGame->wQuery);
if(prev_operation == COMBOBOX_DBCATEGORY) { if(prev_operation == COMBOBOX_DBCATEGORY) {
mainGame->cbDBCategory->setSelected(prev_category); mainGame->cbDBCategory->setSelected(prev_category);
} } else if(prev_operation == COMBOBOX_DBDECKS) {
else if(prev_operation == COMBOBOX_DBDECKS) {
mainGame->cbDBDecks->setSelected(prev_deck); mainGame->cbDBDecks->setSelected(prev_deck);
} }
prev_operation = 0; prev_operation = 0;
...@@ -1436,7 +1435,7 @@ void DeckBuilder::FilterCards() { ...@@ -1436,7 +1435,7 @@ void DeckBuilder::FilterCards() {
} }
if(filter_effect && !(data.category & filter_effect)) if(filter_effect && !(data.category & filter_effect))
continue; continue;
if(filter_marks && (data.link_marker & filter_marks)!= filter_marks) if(filter_marks && (data.link_marker & filter_marks) != filter_marks)
continue; continue;
if(filter_lm) { if(filter_lm) {
if(filter_lm <= 3 && (!filterList->count(ptr->first) || (*filterList).at(ptr->first) != filter_lm - 1)) if(filter_lm <= 3 && (!filterList->count(ptr->first) || (*filterList).at(ptr->first) != filter_lm - 1))
...@@ -1682,22 +1681,21 @@ static inline wchar_t NormalizeChar(wchar_t c) { ...@@ -1682,22 +1681,21 @@ static inline wchar_t NormalizeChar(wchar_t c) {
} }
return c; return c;
} }
bool DeckBuilder::CardNameContains(const wchar_t *haystack, const wchar_t *needle) bool DeckBuilder::CardNameContains(const wchar_t* haystack, const wchar_t* needle) {
{ if(!needle[0]) {
if (!needle[0]) {
return true; return true;
} }
if (!haystack) { if(!haystack) {
return false; return false;
} }
int i = 0; int i = 0;
int j = 0; int j = 0;
while (haystack[i]) { while(haystack[i]) {
wchar_t ca = NormalizeChar(haystack[i]); wchar_t ca = NormalizeChar(haystack[i]);
wchar_t cb = NormalizeChar(needle[j]); wchar_t cb = NormalizeChar(needle[j]);
if (ca == cb) { if(ca == cb) {
j++; j++;
if (!needle[j]) { if(!needle[j]) {
return true; return true;
} }
} else { } else {
......
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