Skip to content

Commit f82db88

Browse files
salix5Copilot
andcommitted
workaround flag
Co-authored-by: Copilot <copilot@github.com>
1 parent ceef04e commit f82db88

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

gframe/deck_manager.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,16 @@ uint32_t DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, size_t ru
187187
break;
188188
}
189189
}
190-
if (result)
191-
return (DECKERROR_POINT << 28) | (result & 0x0fffffffU);
190+
if (result) {
191+
uint32_t code = 0;
192+
if (deck.main.size())
193+
code = deck.main[0]->code;
194+
else if (deck.extra.size())
195+
code = deck.extra[0]->code;
196+
else if (deck.side.size())
197+
code = deck.side[0]->code;
198+
return (DECKERROR_LFLIST << 28) | (code & MAX_CARD_ID);
199+
}
192200
return 0;
193201
}
194202
uint32_t DeckManager::LoadDeck(Deck& deck, uint32_t dbuf[], int mainc, int sidec, bool is_packlist) {

gframe/duelclient.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,6 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, int len) {
329329
myswprintf(msgbuf, dataManager.GetSysString(1432), dataManager.GetName(code));
330330
break;
331331
}
332-
case DECKERROR_POINT: {
333-
myswprintf(msgbuf, L"%ls%d", dataManager.GetSysString(1433), code);
334-
break;
335-
}
336332
default: {
337333
myswprintf(msgbuf, dataManager.GetSysString(1406));
338334
break;

gframe/network.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ class DuelMode {
331331
#define DECKERROR_EXTRACOUNT 0x7U
332332
#define DECKERROR_SIDECOUNT 0x8U
333333
#define DECKERROR_NOTAVAIL 0x9U
334-
#define DECKERROR_POINT 0xAU
335334

336335
#define MODE_SINGLE 0x0
337336
#define MODE_MATCH 0x1

strings.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,6 @@
467467
!system 1430 选择的表示形式不符合条件。
468468
!system 1431 选择的指示物不符合条件。
469469
!system 1432 「%ls」不允许在当前设定下使用。
470-
!system 1433 卡组点数超过上限,当前点数:
471470
!system 1440 关闭大图
472471
!system 1441 放大
473472
!system 1442 缩小

0 commit comments

Comments
 (0)