Skip to content

Y
ygopro
You need to sign in or sign up before continuing.
Commit 5ed73cba authored by wind2009's avatar wind2009
Browse files
Options

Merge remote-tracking branch 'upstream/master' into server-develop

parents c5c8860e fd189e5c
Pipeline #34414 failed with stages
      in 4 minutes and 19 seconds
      Expand all Show whitespace changes
      Inline Side-by-side
      Showing with 329 additions and 498 deletions
      .github/workflows/build.yml
      View file @ 5ed73cba
      ...@@ -132,6 +132,7 @@ jobs: ...@@ -132,6 +132,7 @@ jobs:
      - name: Copy premake files - name: Copy premake files
      run: | run: |
      xcopy /E premake\* . xcopy /E premake\* .
      xcopy /E resource\* .
      - name: Use premake to generate Visual Studio solution (2019) - name: Use premake to generate Visual Studio solution (2019)
      if: matrix.os == 'windows-2019' if: matrix.os == 'windows-2019'
      ...@@ -228,6 +229,7 @@ jobs: ...@@ -228,6 +229,7 @@ jobs:
      - name: Copy premake files - name: Copy premake files
      run: | run: |
      cp -r premake/* . cp -r premake/* .
      cp -r resource/* .
      - name: Use premake to generate make files - name: Use premake to generate make files
      run: | run: |
      ...@@ -321,6 +323,7 @@ jobs: ...@@ -321,6 +323,7 @@ jobs:
      - name: Copy premake files - name: Copy premake files
      run: | run: |
      cp -r premake/* . cp -r premake/* .
      cp -r resource/* .
      - name: Use premake to generate make files (Intel) - name: Use premake to generate make files (Intel)
      if: runner.arch == 'X64' if: runner.arch == 'X64'
      ......
      gframe/deck_con.cpp
      View file @ 5ed73cba
      ...@@ -47,7 +47,7 @@ static inline bool havePopupWindow() { ...@@ -47,7 +47,7 @@ static inline bool havePopupWindow() {
      } }
      static inline void get_deck_file(wchar_t* ret) { static inline void get_deck_file(wchar_t* ret) {
      deckManager.GetDeckFile(ret, mainGame->cbDBCategory->getSelected(), mainGame->cbDBCategory->getText(), mainGame->cbDBDecks->getText()); DeckManager::GetDeckFile(ret, mainGame->cbDBCategory->getSelected(), mainGame->cbDBCategory->getText(), mainGame->cbDBDecks->getText());
      } }
      static inline void load_current_deck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck) { static inline void load_current_deck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck) {
      ...@@ -184,7 +184,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -184,7 +184,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
      break; break;
      wchar_t filepath[256]; wchar_t filepath[256];
      get_deck_file(filepath); get_deck_file(filepath);
      if(deckManager.SaveDeck(deckManager.current_deck, filepath)) { if(DeckManager::SaveDeck(deckManager.current_deck, filepath)) {
      mainGame->stACMessage->setText(dataManager.GetSysString(1335)); mainGame->stACMessage->setText(dataManager.GetSysString(1335));
      mainGame->PopupElement(mainGame->wACMessage, 20); mainGame->PopupElement(mainGame->wACMessage, 20);
      is_modified = false; is_modified = false;
      ...@@ -210,10 +210,10 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -210,10 +210,10 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
      } }
      int catesel = mainGame->cbDBCategory->getSelected(); int catesel = mainGame->cbDBCategory->getSelected();
      wchar_t catepath[256]; wchar_t catepath[256];
      deckManager.GetCategoryPath(catepath, catesel, mainGame->cbDBCategory->getText()); DeckManager::GetCategoryPath(catepath, catesel, mainGame->cbDBCategory->getText());
      wchar_t filepath[256]; wchar_t filepath[256];
      myswprintf(filepath, L"%ls/%ls.ydk", catepath, dname); myswprintf(filepath, L"%ls/%ls.ydk", catepath, dname);
      if(deckManager.SaveDeck(deckManager.current_deck, filepath)) { if(DeckManager::SaveDeck(deckManager.current_deck, filepath)) {
      mainGame->stACMessage->setText(dataManager.GetSysString(1335)); mainGame->stACMessage->setText(dataManager.GetSysString(1335));
      mainGame->PopupElement(mainGame->wACMessage, 20); mainGame->PopupElement(mainGame->wACMessage, 20);
      is_modified = false; is_modified = false;
      ...@@ -393,7 +393,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -393,7 +393,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
      case BUTTON_NEW_CATEGORY: { case BUTTON_NEW_CATEGORY: {
      int catesel = 0; int catesel = 0;
      const wchar_t* catename = mainGame->ebDMName->getText(); const wchar_t* catename = mainGame->ebDMName->getText();
      if(deckManager.CreateCategory(catename)) { if(DeckManager::CreateCategory(catename)) {
      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;
      ...@@ -420,7 +420,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -420,7 +420,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
      int catesel = mainGame->lstCategories->getSelected(); int catesel = mainGame->lstCategories->getSelected();
      const wchar_t* oldcatename = mainGame->lstCategories->getListItem(catesel); const wchar_t* oldcatename = mainGame->lstCategories->getListItem(catesel);
      const wchar_t* newcatename = mainGame->ebDMName->getText(); const wchar_t* newcatename = mainGame->ebDMName->getText();
      if(deckManager.RenameCategory(oldcatename, newcatename)) { if(DeckManager::RenameCategory(oldcatename, newcatename)) {
      mainGame->cbDBCategory->removeItem(catesel); mainGame->cbDBCategory->removeItem(catesel);
      mainGame->cbDBCategory->addItem(newcatename); mainGame->cbDBCategory->addItem(newcatename);
      mainGame->lstCategories->removeItem(catesel); mainGame->lstCategories->removeItem(catesel);
      ...@@ -449,7 +449,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -449,7 +449,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
      case BUTTON_DELETE_CATEGORY: { case BUTTON_DELETE_CATEGORY: {
      int catesel = mainGame->lstCategories->getSelected(); int catesel = mainGame->lstCategories->getSelected();
      const wchar_t* catename = mainGame->lstCategories->getListItem(catesel); const wchar_t* catename = mainGame->lstCategories->getListItem(catesel);
      if(deckManager.DeleteCategory(catename)) { if(DeckManager::DeleteCategory(catename)) {
      mainGame->cbDBCategory->removeItem(catesel); mainGame->cbDBCategory->removeItem(catesel);
      mainGame->lstCategories->removeItem(catesel); mainGame->lstCategories->removeItem(catesel);
      catesel = 2; catesel = 2;
      ...@@ -467,7 +467,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -467,7 +467,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
      case BUTTON_NEW_DECK: { case BUTTON_NEW_DECK: {
      const wchar_t* deckname = mainGame->ebDMName->getText(); const wchar_t* deckname = mainGame->ebDMName->getText();
      wchar_t catepath[256]; wchar_t catepath[256];
      deckManager.GetCategoryPath(catepath, mainGame->cbDBCategory->getSelected(), mainGame->cbDBCategory->getText()); DeckManager::GetCategoryPath(catepath, mainGame->cbDBCategory->getSelected(), mainGame->cbDBCategory->getText());
      wchar_t filepath[256]; wchar_t filepath[256];
      myswprintf(filepath, L"%ls/%ls.ydk", catepath, deckname); myswprintf(filepath, L"%ls/%ls.ydk", catepath, deckname);
      bool res = false; bool res = false;
      ...@@ -475,7 +475,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -475,7 +475,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
      deckManager.current_deck.main.clear(); deckManager.current_deck.main.clear();
      deckManager.current_deck.extra.clear(); deckManager.current_deck.extra.clear();
      deckManager.current_deck.side.clear(); deckManager.current_deck.side.clear();
      res = deckManager.SaveDeck(deckManager.current_deck, filepath); res = DeckManager::SaveDeck(deckManager.current_deck, filepath);
      RefreshDeckList(); RefreshDeckList();
      ChangeCategory(mainGame->lstCategories->getSelected()); ChangeCategory(mainGame->lstCategories->getSelected());
      } }
      ...@@ -532,7 +532,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -532,7 +532,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
      int decksel = mainGame->lstDecks->getSelected(); int decksel = mainGame->lstDecks->getSelected();
      wchar_t filepath[256]; wchar_t filepath[256];
      get_deck_file(filepath); get_deck_file(filepath);
      if(deckManager.DeleteDeck(filepath)) { if(DeckManager::DeleteDeck(filepath)) {
      mainGame->lstDecks->removeItem(decksel); mainGame->lstDecks->removeItem(decksel);
      mainGame->cbDBDecks->removeItem(decksel); mainGame->cbDBDecks->removeItem(decksel);
      decksel--; decksel--;
      ...@@ -608,7 +608,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -608,7 +608,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
      } }
      bool res = false; bool res = false;
      if(!FileSystem::IsFileExists(newfilepath)) { if(!FileSystem::IsFileExists(newfilepath)) {
      res = deckManager.SaveDeck(deckManager.current_deck, newfilepath); res = DeckManager::SaveDeck(deckManager.current_deck, newfilepath);
      } }
      mainGame->lstCategories->setSelected(newcatename); mainGame->lstCategories->setSelected(newcatename);
      int catesel = mainGame->lstCategories->getSelected(); int catesel = mainGame->lstCategories->getSelected();
      ...@@ -709,7 +709,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -709,7 +709,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
      mainGame->cbDBDecks->setSelected(sel); mainGame->cbDBDecks->setSelected(sel);
      wchar_t filepath[256]; wchar_t filepath[256];
      get_deck_file(filepath); get_deck_file(filepath);
      if(deckManager.DeleteDeck(filepath)) { if(DeckManager::DeleteDeck(filepath)) {
      mainGame->cbDBDecks->removeItem(sel); mainGame->cbDBDecks->removeItem(sel);
      int count = mainGame->cbDBDecks->getItemCount(); int count = mainGame->cbDBDecks->getItemCount();
      if(sel >= count) if(sel >= count)
      ...@@ -1004,7 +1004,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -1004,7 +1004,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
      break; break;
      wchar_t filepath[256]; wchar_t filepath[256];
      wchar_t catepath[256]; wchar_t catepath[256];
      deckManager.GetCategoryPath(catepath, mainGame->lstCategories->getSelected(), mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected())); DeckManager::GetCategoryPath(catepath, mainGame->lstCategories->getSelected(), mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected()));
      myswprintf(filepath, L"%ls/%ls.ydk", catepath, mainGame->lstDecks->getListItem(decksel)); myswprintf(filepath, L"%ls/%ls.ydk", catepath, mainGame->lstDecks->getListItem(decksel));
      deckManager.LoadCurrentDeck(filepath, showing_pack); deckManager.LoadCurrentDeck(filepath, showing_pack);
      RefreshPackListScroll(); RefreshPackListScroll();
      ...@@ -1608,7 +1608,7 @@ void DeckBuilder::RefreshDeckList() { ...@@ -1608,7 +1608,7 @@ void DeckBuilder::RefreshDeckList() {
      irr::gui::IGUIListBox* lstCategories = mainGame->lstCategories; irr::gui::IGUIListBox* lstCategories = mainGame->lstCategories;
      irr::gui::IGUIListBox* lstDecks = mainGame->lstDecks; irr::gui::IGUIListBox* lstDecks = mainGame->lstDecks;
      wchar_t catepath[256]; wchar_t catepath[256];
      deckManager.GetCategoryPath(catepath, lstCategories->getSelected(), lstCategories->getListItem(lstCategories->getSelected())); DeckManager::GetCategoryPath(catepath, lstCategories->getSelected(), lstCategories->getListItem(lstCategories->getSelected()));
      lstDecks->clear(); lstDecks->clear();
      mainGame->RefreshDeck(catepath, [lstDecks](const wchar_t* item) { lstDecks->addItem(item); }); mainGame->RefreshDeck(catepath, [lstDecks](const wchar_t* item) { lstDecks->addItem(item); });
      } }
      ......
      gframe/deck_manager.cpp
      View file @ 5ed73cba
      ...@@ -15,6 +15,7 @@ void DeckManager::LoadLFListSingle(const char* path) { ...@@ -15,6 +15,7 @@ void DeckManager::LoadLFListSingle(const char* path) {
      FILE* fp = std::fopen(path, "r"); FILE* fp = std::fopen(path, "r");
      char linebuf[256]{}; char linebuf[256]{};
      wchar_t strBuffer[256]{}; wchar_t strBuffer[256]{};
      char str1[16]{};
      if(fp) { if(fp) {
      while(std::fgets(linebuf, sizeof linebuf, fp)) { while(std::fgets(linebuf, sizeof linebuf, fp)) {
      if(linebuf[0] == '#') if(linebuf[0] == '#')
      ...@@ -34,10 +35,11 @@ void DeckManager::LoadLFListSingle(const char* path) { ...@@ -34,10 +35,11 @@ void DeckManager::LoadLFListSingle(const char* path) {
      continue; continue;
      unsigned int code = 0; unsigned int code = 0;
      int count = -1; int count = -1;
      if (std::sscanf(linebuf, "%9u%*[ ]%9d", &code, &count) != 2) if (std::sscanf(linebuf, "%10s%*[ ]%1d", str1, &count) != 2)
      continue; continue;
      if (count < 0 || count > 2) if (count < 0 || count > 2)
      continue; continue;
      code = std::strtoul(str1, nullptr, 10);
      cur->content[code] = count; cur->content[code] = count;
      cur->hash = cur->hash ^ ((code << 18) | (code >> 14)) ^ ((code << (27 + count)) | (code >> (5 - count))); cur->hash = cur->hash ^ ((code << 18) | (code >> 14)) ^ ((code << (27 + count)) | (code >> (5 - count)));
      } }
      ...@@ -80,7 +82,7 @@ static unsigned int checkAvail(unsigned int ot, unsigned int avail) { ...@@ -80,7 +82,7 @@ static unsigned int checkAvail(unsigned int ot, unsigned int avail) {
      return DECKERROR_TCGONLY; return DECKERROR_TCGONLY;
      return DECKERROR_NOTAVAIL; return DECKERROR_NOTAVAIL;
      } }
      unsigned int DeckManager::CheckDeck(Deck& deck, int lfhash, int rule) { unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int rule) {
      std::unordered_map<int, int> ccount; std::unordered_map<int, int> ccount;
      // rule // rule
      if(deck.main.size() < DECK_MIN_SIZE || deck.main.size() > DECK_MAX_SIZE) if(deck.main.size() < DECK_MIN_SIZE || deck.main.size() > DECK_MAX_SIZE)
      ...@@ -144,13 +146,12 @@ unsigned int DeckManager::CheckDeck(Deck& deck, int lfhash, int rule) { ...@@ -144,13 +146,12 @@ unsigned int DeckManager::CheckDeck(Deck& deck, int lfhash, int rule) {
      } }
      return 0; return 0;
      } }
      int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_packlist) { uint32_t DeckManager::LoadDeck(Deck& deck, uint32_t dbuf[], int mainc, int sidec, bool is_packlist) {
      deck.clear(); deck.clear();
      int code; uint32_t errorcode = 0;
      int errorcode = 0;
      CardData cd; CardData cd;
      for(int i = 0; i < mainc; ++i) { for(int i = 0; i < mainc; ++i) {
      code = dbuf[i]; auto code = dbuf[i];
      if(!dataManager.GetData(code, &cd)) { if(!dataManager.GetData(code, &cd)) {
      errorcode = code; errorcode = code;
      continue; continue;
      ...@@ -173,7 +174,7 @@ int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_p ...@@ -173,7 +174,7 @@ int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_p
      } }
      } }
      for(int i = 0; i < sidec; ++i) { for(int i = 0; i < sidec; ++i) {
      code = dbuf[mainc + i]; auto code = dbuf[mainc + i];
      if(!dataManager.GetData(code, &cd)) { if(!dataManager.GetData(code, &cd)) {
      errorcode = code; errorcode = code;
      continue; continue;
      ...@@ -187,22 +188,21 @@ int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_p ...@@ -187,22 +188,21 @@ int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_p
      } }
      return errorcode; return errorcode;
      } }
      int DeckManager::LoadDeck(Deck& deck, std::istringstream& deckStream, bool is_packlist) { uint32_t DeckManager::LoadDeckFromStream(Deck& deck, std::istringstream& deckStream, bool is_packlist) {
      size_t ct = 0; int ct = 0;
      int mainc = 0, sidec = 0, code = 0; int mainc = 0, sidec = 0;
      int cardlist[PACK_MAX_SIZE]{}; uint32_t cardlist[PACK_MAX_SIZE]{};
      bool is_side = false; bool is_side = false;
      std::string linebuf; std::string linebuf;
      while (std::getline(deckStream, linebuf, '\n') && ct < (sizeof cardlist / sizeof cardlist[0])) { while (std::getline(deckStream, linebuf, '\n') && ct < PACK_MAX_SIZE) {
      if (linebuf[0] == '!') { if (linebuf[0] == '!') {
      is_side = true; is_side = true;
      continue; continue;
      } }
      if (linebuf[0] < '0' || linebuf[0] > '9') if (linebuf[0] < '0' || linebuf[0] > '9')
      continue; continue;
      errno = 0; auto code = std::strtoul(linebuf.c_str(), nullptr, 10);
      code = std::strtol(linebuf.c_str(), nullptr, 10); if (code >= UINT32_MAX)
      if (errno == ERANGE)
      continue; continue;
      cardlist[ct++] = code; cardlist[ct++] = code;
      if (is_side) if (is_side)
      ...@@ -212,15 +212,15 @@ int DeckManager::LoadDeck(Deck& deck, std::istringstream& deckStream, bool is_pa ...@@ -212,15 +212,15 @@ int DeckManager::LoadDeck(Deck& deck, std::istringstream& deckStream, bool is_pa
      } }
      return LoadDeck(deck, cardlist, mainc, sidec, is_packlist); return LoadDeck(deck, cardlist, mainc, sidec, is_packlist);
      } }
      bool DeckManager::LoadSide(Deck& deck, int* dbuf, int mainc, int sidec) { bool DeckManager::LoadSide(Deck& deck, uint32_t dbuf[], int mainc, int sidec) {
      std::unordered_map<int, int> pcount; std::unordered_map<uint32_t, int> pcount;
      std::unordered_map<int, int> ncount; std::unordered_map<uint32_t, int> ncount;
      for(size_t i = 0; i < deck.main.size(); ++i) for(size_t i = 0; i < deck.main.size(); ++i)
      ++pcount[deck.main[i]->first]; pcount[deck.main[i]->first]++;
      for(size_t i = 0; i < deck.extra.size(); ++i) for(size_t i = 0; i < deck.extra.size(); ++i)
      ++pcount[deck.extra[i]->first]; pcount[deck.extra[i]->first]++;
      for(size_t i = 0; i < deck.side.size(); ++i) for(size_t i = 0; i < deck.side.size(); ++i)
      ++pcount[deck.side[i]->first]; pcount[deck.side[i]->first]++;
      Deck ndeck; Deck ndeck;
      LoadDeck(ndeck, dbuf, mainc, sidec); LoadDeck(ndeck, dbuf, mainc, sidec);
      #ifndef YGOPRO_NO_SIDE_CHECK #ifndef YGOPRO_NO_SIDE_CHECK
      ...@@ -228,11 +228,11 @@ bool DeckManager::LoadSide(Deck& deck, int* dbuf, int mainc, int sidec) { ...@@ -228,11 +228,11 @@ bool DeckManager::LoadSide(Deck& deck, int* dbuf, int mainc, int sidec) {
      return false; return false;
      #endif #endif
      for(size_t i = 0; i < ndeck.main.size(); ++i) for(size_t i = 0; i < ndeck.main.size(); ++i)
      ++ncount[ndeck.main[i]->first]; ncount[ndeck.main[i]->first]++;
      for(size_t i = 0; i < ndeck.extra.size(); ++i) for(size_t i = 0; i < ndeck.extra.size(); ++i)
      ++ncount[ndeck.extra[i]->first]; ncount[ndeck.extra[i]->first]++;
      for(size_t i = 0; i < ndeck.side.size(); ++i) for(size_t i = 0; i < ndeck.side.size(); ++i)
      ++ncount[ndeck.side[i]->first]; ncount[ndeck.side[i]->first]++;
      #ifndef YGOPRO_NO_SIDE_CHECK #ifndef YGOPRO_NO_SIDE_CHECK
      for (auto& cdit : ncount) for (auto& cdit : ncount)
      if (cdit.second != pcount[cdit.first]) if (cdit.second != pcount[cdit.first])
      ...@@ -309,8 +309,8 @@ bool DeckManager::LoadCurrentDeck(const wchar_t* file, bool is_packlist) { ...@@ -309,8 +309,8 @@ bool DeckManager::LoadCurrentDeck(const wchar_t* file, bool is_packlist) {
      return false; return false;
      } }
      std::istringstream deckStream(deckBuffer); std::istringstream deckStream(deckBuffer);
      LoadDeck(current_deck, deckStream, is_packlist); LoadDeckFromStream(current_deck, deckStream, is_packlist);
      return true; // the above LoadDeck has return value but we ignore it here for now return true; // the above function has return value but we ignore it here for now
      } }
      bool DeckManager::LoadCurrentDeck(int category_index, const wchar_t* category_name, const wchar_t* deckname) { bool DeckManager::LoadCurrentDeck(int category_index, const wchar_t* category_name, const wchar_t* deckname) {
      wchar_t filepath[256]; wchar_t filepath[256];
      ......
      gframe/deck_manager.h
      View file @ 5ed73cba
      ...@@ -64,24 +64,27 @@ public: ...@@ -64,24 +64,27 @@ public:
      void LoadLFList(); void LoadLFList();
      const wchar_t* GetLFListName(unsigned int lfhash); const wchar_t* GetLFListName(unsigned int lfhash);
      const LFList* GetLFList(unsigned int lfhash); const LFList* GetLFList(unsigned int lfhash);
      unsigned int CheckDeck(Deck& deck, int lfhash, int rule); unsigned int CheckDeck(const Deck& deck, unsigned int lfhash, int rule);
      int LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_packlist = false);
      int LoadDeck(Deck& deck, std::istringstream& deckStream, bool is_packlist = false);
      bool LoadSide(Deck& deck, int* dbuf, int mainc, int sidec);
      #ifndef YGOPRO_SERVER_MODE #ifndef YGOPRO_SERVER_MODE
      void GetCategoryPath(wchar_t* ret, int index, const wchar_t* text);
      void GetDeckFile(wchar_t* ret, int category_index, const wchar_t* category_name, const wchar_t* deckname);
      FILE* OpenDeckFile(const wchar_t* file, const char* mode);
      irr::io::IReadFile* OpenDeckReader(const wchar_t* file);
      bool LoadCurrentDeck(const wchar_t* file, bool is_packlist = false); bool LoadCurrentDeck(const wchar_t* file, bool is_packlist = false);
      bool LoadCurrentDeck(int category_index, const wchar_t* category_name, const wchar_t* deckname); bool LoadCurrentDeck(int category_index, const wchar_t* category_name, const wchar_t* deckname);
      bool SaveDeck(Deck& deck, const wchar_t* file);
      bool DeleteDeck(const wchar_t* file);
      bool CreateCategory(const wchar_t* name);
      bool RenameCategory(const wchar_t* oldname, const wchar_t* newname);
      bool DeleteCategory(const wchar_t* name);
      bool SaveDeckBuffer(const int deckbuf[], const wchar_t* name); bool SaveDeckBuffer(const int deckbuf[], const wchar_t* name);
      #endif //YGOPRO_SERVER_MODE #endif //YGOPRO_SERVER_MODE
      static uint32_t LoadDeck(Deck& deck, uint32_t dbuf[], int mainc, int sidec, bool is_packlist = false);
      static uint32_t LoadDeckFromStream(Deck& deck, std::istringstream& deckStream, bool is_packlist = false);
      static bool LoadSide(Deck& deck, uint32_t dbuf[], int mainc, int sidec);
      #ifndef YGOPRO_SERVER_MODE
      static void GetCategoryPath(wchar_t* ret, int index, const wchar_t* text);
      static void GetDeckFile(wchar_t* ret, int category_index, const wchar_t* category_name, const wchar_t* deckname);
      static FILE* OpenDeckFile(const wchar_t* file, const char* mode);
      static irr::io::IReadFile* OpenDeckReader(const wchar_t* file);
      static bool SaveDeck(Deck& deck, const wchar_t* file);
      static bool DeleteDeck(const wchar_t* file);
      static bool CreateCategory(const wchar_t* name);
      static bool RenameCategory(const wchar_t* oldname, const wchar_t* newname);
      static bool DeleteCategory(const wchar_t* name);
      #endif //YGOPRO_SERVER_MODE
      }; };
      extern DeckManager deckManager; extern DeckManager deckManager;
      ......
      gframe/game.cpp
      View file @ 5ed73cba
      ...@@ -1313,7 +1313,7 @@ void Game::RefreshDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBo ...@@ -1313,7 +1313,7 @@ void Game::RefreshDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBo
      return; return;
      } }
      wchar_t catepath[256]; wchar_t catepath[256];
      deckManager.GetCategoryPath(catepath, cbCategory->getSelected(), cbCategory->getText()); DeckManager::GetCategoryPath(catepath, cbCategory->getSelected(), cbCategory->getText());
      cbDeck->clear(); cbDeck->clear();
      RefreshDeck(catepath, [cbDeck](const wchar_t* item) { cbDeck->addItem(item); }); RefreshDeck(catepath, [cbDeck](const wchar_t* item) { cbDeck->addItem(item); });
      } }
      ......
      gframe/menu_handler.cpp
      View file @ 5ed73cba
      ...@@ -367,7 +367,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -367,7 +367,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
      wchar_t arg1[512]; wchar_t arg1[512];
      if(mainGame->botInfo[sel].select_deckfile) { if(mainGame->botInfo[sel].select_deckfile) {
      wchar_t botdeck[256]; wchar_t botdeck[256];
      deckManager.GetDeckFile(botdeck, mainGame->cbBotDeckCategory->getSelected(), mainGame->cbBotDeckCategory->getText(), mainGame->cbBotDeck->getText()); DeckManager::GetDeckFile(botdeck, mainGame->cbBotDeckCategory->getSelected(), mainGame->cbBotDeckCategory->getText(), mainGame->cbBotDeck->getText());
      myswprintf(arg1, L"%ls DeckFile='%ls'", mainGame->botInfo[sel].command, botdeck); myswprintf(arg1, L"%ls DeckFile='%ls'", mainGame->botInfo[sel].command, botdeck);
      } }
      else else
      ...@@ -386,7 +386,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) { ...@@ -386,7 +386,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
      wchar_t warg1[512]; wchar_t warg1[512];
      if(mainGame->botInfo[sel].select_deckfile) { if(mainGame->botInfo[sel].select_deckfile) {
      wchar_t botdeck[256]; wchar_t botdeck[256];
      deckManager.GetDeckFile(botdeck, mainGame->cbBotDeckCategory->getSelected(), mainGame->cbBotDeckCategory->getText(), mainGame->cbBotDeck->getText()); DeckManager::GetDeckFile(botdeck, mainGame->cbBotDeckCategory->getSelected(), mainGame->cbBotDeckCategory->getText(), mainGame->cbBotDeck->getText());
      myswprintf(warg1, L"%ls DeckFile='%ls'", mainGame->botInfo[sel].command, botdeck); myswprintf(warg1, L"%ls DeckFile='%ls'", mainGame->botInfo[sel].command, botdeck);
      } }
      else else
      ......
      gframe/network.h
      View file @ 5ed73cba
      ...@@ -57,7 +57,7 @@ static_assert(sizeof(HostRequest) == 2, "size mismatch: HostRequest"); ...@@ -57,7 +57,7 @@ static_assert(sizeof(HostRequest) == 2, "size mismatch: HostRequest");
      struct CTOS_DeckData { struct CTOS_DeckData {
      int32_t mainc{}; int32_t mainc{};
      int32_t sidec{}; int32_t sidec{};
      int32_t list[MAINC_MAX + SIDEC_MAX]{}; uint32_t list[MAINC_MAX + SIDEC_MAX]{};
      }; };
      check_trivially_copyable(CTOS_DeckData); check_trivially_copyable(CTOS_DeckData);
      ......
      gframe/premake5.lua
      View file @ 5ed73cba
      ...@@ -35,6 +35,7 @@ if SERVER_MODE then ...@@ -35,6 +35,7 @@ if SERVER_MODE then
      else else
      kind "WindowedApp" kind "WindowedApp"
      cppdialect "C++14" cppdialect "C++14"
      rtti "Off"
      files { "*.cpp", "*.h" } files { "*.cpp", "*.h" }
      includedirs { "../ocgcore" } includedirs { "../ocgcore" }
      ...@@ -106,8 +107,6 @@ if SERVER_MODE then ...@@ -106,8 +107,6 @@ if SERVER_MODE then
      else else
      links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" } links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
      end end
      filter "not action:vs*"
      buildoptions { "-fno-rtti" }
      filter "not system:windows" filter "not system:windows"
      links { "event_pthreads", "dl", "pthread" } links { "event_pthreads", "dl", "pthread" }
      filter "system:macosx" filter "system:macosx"
      ......
      gframe/single_duel.cpp
      View file @ 5ed73cba
      ...@@ -417,9 +417,9 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) { ...@@ -417,9 +417,9 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
      return; return;
      } }
      if(duel_count == 0) { if(duel_count == 0) {
      deck_error[dp->type] = deckManager.LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec); deck_error[dp->type] = DeckManager::LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec);
      } else { } else {
      if(deckManager.LoadSide(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec)) { if(DeckManager::LoadSide(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec)) {
      ready[dp->type] = true; ready[dp->type] = true;
      NetServer::SendPacketToPlayer(dp, STOC_DUEL_START); NetServer::SendPacketToPlayer(dp, STOC_DUEL_START);
      if(ready[0] && ready[1]) { if(ready[0] && ready[1]) {
      ......
      gframe/tag_duel.cpp
      View file @ 5ed73cba
      ...@@ -402,7 +402,7 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) { ...@@ -402,7 +402,7 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, unsigned char* pdata, int len) {
      NetServer::SendPacketToPlayer(dp, STOC_ERROR_MSG, scem); NetServer::SendPacketToPlayer(dp, STOC_ERROR_MSG, scem);
      return; return;
      } }
      deck_error[dp->type] = deckManager.LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec); deck_error[dp->type] = DeckManager::LoadDeck(pdeck[dp->type], deckbuf.list, deckbuf.mainc, deckbuf.sidec);
      } }
      void TagDuel::StartDuel(DuelPlayer* dp) { void TagDuel::StartDuel(DuelPlayer* dp) {
      if(dp != host_player) if(dp != host_player)
      ......
      lflist.conf
      View file @ 5ed73cba
      This diff is collapsed.
      premake/event/premake5.lua
      View file @ 5ed73cba
      project "event" project "event"
      kind "StaticLib" kind "StaticLib"
      cdialect "C11"
      includedirs { "include", "compat" } includedirs { "include", "compat" }
      ......
      premake/freetype/premake5.lua
      View file @ 5ed73cba
      project "freetype" project "freetype"
      kind "StaticLib" kind "StaticLib"
      cdialect "C11"
      includedirs { "include" } includedirs { "include" }
      defines { "FT2_BUILD_LIBRARY" } defines { "FT2_BUILD_LIBRARY" }
      ......
      premake/irrlicht/defines.lua 0 → 100644
      View file @ 5ed73cba
      defines {
      "_IRR_STATIC_LIB_",
      "NO_IRR_USE_NON_SYSTEM_BZLIB_",
      "NO_IRR_COMPILE_WITH_BZIP2_",
      "NO_IRR_COMPILE_WITH_CONSOLE_DEVICE_",
      "NO_IRR_COMPILE_WITH_DIRECT3D_8_",
      "NO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_",
      "NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_",
      "NO_IRR_COMPILE_WITH_SOFTWARE_",
      "NO_IRR_COMPILE_WITH_BURNINGSVIDEO_",
      "NO_IRR_COMPILE_WITH_IRR_SCENE_LOADER_",
      "NO_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_",
      "NO_IRR_COMPILE_WITH_IRR_MESH_LOADER_",
      "NO_IRR_COMPILE_WITH_HALFLIFE_LOADER_",
      "NO_IRR_COMPILE_WITH_MD2_LOADER_",
      "NO_IRR_COMPILE_WITH_MD3_LOADER_",
      "NO_IRR_COMPILE_WITH_3DS_LOADER_",
      "NO_IRR_COMPILE_WITH_COLLADA_LOADER_",
      "NO_IRR_COMPILE_WITH_CSM_LOADER_",
      "NO_IRR_COMPILE_WITH_BSP_LOADER_",
      "NO_IRR_COMPILE_WITH_DMF_LOADER_",
      "NO_IRR_COMPILE_WITH_LMTS_LOADER_",
      "NO_IRR_COMPILE_WITH_MY3D_LOADER_",
      "NO_IRR_COMPILE_WITH_OBJ_LOADER_",
      "NO_IRR_COMPILE_WITH_OCT_LOADER_",
      "NO_IRR_COMPILE_WITH_LWO_LOADER_",
      "NO_IRR_COMPILE_WITH_STL_LOADER_",
      "NO_IRR_COMPILE_WITH_PLY_LOADER_",
      "NO_IRR_COMPILE_WITH_SMF_LOADER_",
      "NO_IRR_COMPILE_WITH_IRR_WRITER_",
      "NO_IRR_COMPILE_WITH_COLLADA_WRITER_",
      "NO_IRR_COMPILE_WITH_STL_WRITER_",
      "NO_IRR_COMPILE_WITH_OBJ_WRITER_",
      "NO_IRR_COMPILE_WITH_PLY_WRITER_",
      "NO_IRR_COMPILE_WITH_PCX_LOADER_",
      "NO_IRR_COMPILE_WITH_PPM_LOADER_",
      "NO_IRR_COMPILE_WITH_PSD_LOADER_",
      "NO_IRR_COMPILE_WITH_TGA_LOADER_",
      "NO_IRR_COMPILE_WITH_WAL_LOADER_",
      "NO_IRR_COMPILE_WITH_LMP_LOADER_",
      "NO_IRR_COMPILE_WITH_RGB_LOADER_",
      "NO_IRR_COMPILE_WITH_PCX_WRITER_",
      "NO_IRR_COMPILE_WITH_PPM_WRITER_",
      "NO_IRR_COMPILE_WITH_PSD_WRITER_",
      "NO_IRR_COMPILE_WITH_TGA_WRITER_",
      "NO__IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_",
      "NO__IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_",
      "NO__IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_",
      }
      premake/irrlicht/premake5.lua
      View file @ 5ed73cba
      This diff is collapsed.
      premake/sqlite3/premake5.lua
      View file @ 5ed73cba
      project "sqlite3" project "sqlite3"
      kind "StaticLib" kind "StaticLib"
      cdialect "C11"
      files { "sqlite3.c", "sqlite3.h" } files { "sqlite3.c", "sqlite3.h" }
      premake5.lua
      View file @ 5ed73cba
      ...@@ -269,7 +269,7 @@ end ...@@ -269,7 +269,7 @@ end
      flags { "LinkTimeOptimization" } flags { "LinkTimeOptimization" }
      end end
      staticruntime "On" staticruntime "On"
      disablewarnings { "4244", "4267", "4838", "4577", "4018", "4996", "4477", "4091", "4800", "6011", "6031", "6054", "6262" } disablewarnings { "4244", "4267", "4838", "4996", "6011", "6031", "6054", "6262" }
      filter { "configurations:Release", "not action:vs*" } filter { "configurations:Release", "not action:vs*" }
      symbols "On" symbols "On"
      ...@@ -282,6 +282,10 @@ end ...@@ -282,6 +282,10 @@ end
      disablewarnings { "6011", "6031", "6054", "6262" } disablewarnings { "6011", "6031", "6054", "6262" }
      filter "action:vs*" filter "action:vs*"
      cdialect "C11"
      if not WINXP_SUPPORT then
      conformancemode "On"
      end
      vectorextensions "SSE2" vectorextensions "SSE2"
      buildoptions { "/utf-8" } buildoptions { "/utf-8" }
      defines { "_CRT_SECURE_NO_WARNINGS" } defines { "_CRT_SECURE_NO_WARNINGS" }
      ......
      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