Commit 27f3ca16 authored by mercury233's avatar mercury233

fix card artworks offset

parent aae465d8
...@@ -866,7 +866,8 @@ void DeckBuilder::FilterCards() { ...@@ -866,7 +866,8 @@ void DeckBuilder::FilterCards() {
if(!tryresult && !CardNameContains(text.name.c_str(), pstr) && text.text.find(pstr) == std::wstring::npos if(!tryresult && !CardNameContains(text.name.c_str(), pstr) && text.text.find(pstr) == std::wstring::npos
&& (!set_code || !check_set_code(data, set_code))) && (!set_code || !check_set_code(data, set_code)))
continue; continue;
if (tryresult && data.code != trycode && data.alias != trycode) if (tryresult && data.code != trycode
&& !(data.alias == trycode && (data.alias - data.code < CARD_ARTWORK_VERSION_OFFSET || data.code - data.alias < CARD_ARTWORK_VERSION_OFFSET)))
continue; continue;
} }
} }
......
...@@ -1215,7 +1215,7 @@ void Game::ShowCardInfo(int code) { ...@@ -1215,7 +1215,7 @@ void Game::ShowCardInfo(int code) {
memset(&cd, 0, sizeof(CardData)); memset(&cd, 0, sizeof(CardData));
imgCard->setImage(imageManager.GetTexture(code)); imgCard->setImage(imageManager.GetTexture(code));
imgCard->setScaleImage(true); imgCard->setScaleImage(true);
if(cd.alias != 0 && (cd.alias - code < 10 || code - cd.alias < 10)) if(cd.alias != 0 && (cd.alias - code < CARD_ARTWORK_VERSION_OFFSET || code - cd.alias < CARD_ARTWORK_VERSION_OFFSET))
myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(cd.alias), cd.alias); myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(cd.alias), cd.alias);
else myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(code), code); else myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(code), code);
stName->setText(formatBuffer); stName->setText(formatBuffer);
......
...@@ -625,4 +625,6 @@ extern Game* mainGame; ...@@ -625,4 +625,6 @@ extern Game* mainGame;
#define BUTTON_MARKERS_OK 381 #define BUTTON_MARKERS_OK 381
#define DEFAULT_DUEL_RULE 4 #define DEFAULT_DUEL_RULE 4
#define CARD_ARTWORK_VERSIONS_OFFSET 10
#endif // GAME_H #endif // GAME_H
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