Skip to content

Y
ygopro-2pick
Commit 20babc45 authored by nanahira's avatar nanahira
Browse files
Options

sync with edo

parent fba37799
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
gframe/deck_manager.cpp
View file @ 20babc45
...@@ -314,23 +314,23 @@ bool DeckManager::DeleteDeck(Deck& deck, const wchar_t* name) { ...@@ -314,23 +314,23 @@ bool DeckManager::DeleteDeck(Deck& deck, const wchar_t* name) {
#endif #endif
} }
const wchar_t* DeckManager::GetMainFormatString() { const wchar_t* DeckManager::GetMainFormatString() {
myswprintf(DeckFormatBuffer, L"%d ( Monster: %d / Spell: %d / Trap: %d )", current_deck.main.size(), GetTypeCount(current_deck.main, TYPE_MONSTER), GetTypeCount(current_deck.main, TYPE_SPELL), GetTypeCount(current_deck.main, TYPE_TRAP)); myswprintf(DeckFormatBuffer, L"%d ( Monster: %d / Spell: %d / Trap: %d )", current_deck.main.size(), TypeCount(current_deck.main, TYPE_MONSTER), TypeCount(current_deck.main, TYPE_SPELL), TypeCount(current_deck.main, TYPE_TRAP));
wchar_t* result = DeckFormatBuffer; wchar_t* result = DeckFormatBuffer;
return result; return result;
} }
const wchar_t* DeckManager::GetExtraFormatString() { const wchar_t* DeckManager::GetExtraFormatString() {
myswprintf(DeckFormatBuffer, L"%d ( Fusion: %d / Synchro: %d / Xyz: %d / Link: %d )", current_deck.extra.size(), GetTypeCount(current_deck.extra, TYPE_FUSION), GetTypeCount(current_deck.extra, TYPE_SYNCHRO), GetTypeCount(current_deck.extra, TYPE_XYZ), GetTypeCount(current_deck.extra, TYPE_LINK)); myswprintf(DeckFormatBuffer, L"%d ( Fusion: %d / Synchro: %d / Xyz: %d / Link: %d )", current_deck.extra.size(), TypeCount(current_deck.extra, TYPE_FUSION), TypeCount(current_deck.extra, TYPE_SYNCHRO), TypeCount(current_deck.extra, TYPE_XYZ), TypeCount(current_deck.extra, TYPE_LINK));
wchar_t* result = DeckFormatBuffer; wchar_t* result = DeckFormatBuffer;
return result; return result;
} }
const wchar_t* DeckManager::GetSideFormatString() { const wchar_t* DeckManager::GetSideFormatString() {
int mc = GetTypeCount(current_deck.side, TYPE_MONSTER); int mc = TypeCount(current_deck.side, TYPE_MONSTER);
int ec = GetTypeCount(current_deck.side, TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK); int ec = TypeCount(current_deck.side, TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK);
myswprintf(DeckFormatBuffer, L"%d ( Monster: %d / Spell: %d / Trap: %d / Extra: %d )", current_deck.side.size(), mc - ec, GetTypeCount(current_deck.side, TYPE_SPELL), GetTypeCount(current_deck.side, TYPE_TRAP), ec); myswprintf(DeckFormatBuffer, L"%d ( Monster: %d / Spell: %d / Trap: %d / Extra: %d )", current_deck.side.size(), mc - ec, TypeCount(current_deck.side, TYPE_SPELL), TypeCount(current_deck.side, TYPE_TRAP), ec);
wchar_t* result = DeckFormatBuffer; wchar_t* result = DeckFormatBuffer;
return result; return result;
} }
int DeckManager::GetTypeCount(std::vector<code_pointer> list, unsigned int ctype) { int DeckManager::TypeCount(std::vector<code_pointer> list, unsigned int ctype) {
int res = 0; int res = 0;
for(size_t i = 0; i < list.size(); ++i) { for(size_t i = 0; i < list.size(); ++i) {
code_pointer cur = list[i]; code_pointer cur = list[i];
......
gframe/deck_manager.h
View file @ 20babc45
...@@ -49,7 +49,7 @@ public: ...@@ -49,7 +49,7 @@ public:
const wchar_t* GetMainFormatString(); const wchar_t* GetMainFormatString();
const wchar_t* GetSideFormatString(); const wchar_t* GetSideFormatString();
const wchar_t* GetExtraFormatString(); const wchar_t* GetExtraFormatString();
int GetTypeCount(std::vector<code_pointer> list, unsigned int ctype); int TypeCount(std::vector<code_pointer> list, unsigned int ctype);
}; };
extern DeckManager deckManager; extern DeckManager deckManager;
......
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