Skip to content

Commit d63b7d7

Browse files
salix5salix5
committed
remove ReadUInt8
1 parent 699a036 commit d63b7d7

5 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎gframe/duelclient.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,9 +1712,9 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
17121712
return false;
17131713
}
17141714
case MSG_SELECT_CHAIN: {
1715-
/*int selecting_player = */BufferIO::ReadUInt8(pbuf);
1716-
int count = BufferIO::ReadUInt8(pbuf);
1717-
int specount = BufferIO::ReadUInt8(pbuf);
1715+
/*int selecting_player = */BufferIO::Read<uint8_t>(pbuf);
1716+
int count = BufferIO::Read<uint8_t>(pbuf);
1717+
int specount = BufferIO::Read<uint8_t>(pbuf);
17181718
/*int hint0 = */BufferIO::ReadInt32(pbuf);
17191719
/*int hint1 = */BufferIO::ReadInt32(pbuf);
17201720
int c, s, ss, desc;
@@ -1728,8 +1728,8 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
17281728
mainGame->dField.activatable_descs.clear();
17291729
mainGame->dField.conti_cards.clear();
17301730
for (int i = 0; i < count; ++i) {
1731-
int flag = BufferIO::ReadUInt8(pbuf);
1732-
int forced = BufferIO::ReadUInt8(pbuf);
1731+
int flag = BufferIO::Read<uint8_t>(pbuf);
1732+
int forced = BufferIO::Read<uint8_t>(pbuf);
17331733
flag |= forced << 8;
17341734
code = BufferIO::ReadInt32(pbuf);
17351735
c = mainGame->LocalPlayer(BufferIO::Read<uint8_t>(pbuf));
@@ -2164,9 +2164,9 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
21642164
return true;
21652165
}
21662166
case MSG_CONFIRM_CARDS: {
2167-
/*int player = */mainGame->LocalPlayer(BufferIO::ReadUInt8(pbuf));
2168-
int skip_panel = BufferIO::ReadUInt8(pbuf);
2169-
int count = BufferIO::ReadUInt8(pbuf);
2167+
/*int player = */mainGame->LocalPlayer(BufferIO::Read<uint8_t>(pbuf));
2168+
int skip_panel = BufferIO::Read<uint8_t>(pbuf);
2169+
int count = BufferIO::Read<uint8_t>(pbuf);
21702170
int c, s;
21712171
unsigned int code, l;
21722172
std::vector<ClientCard*> field_confirm;

‎gframe/replay_mode.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ bool ReplayMode::ReplayAnalyze(unsigned char* msg, unsigned int len) {
391391
return ReadReplayResponse();
392392
}
393393
case MSG_SELECT_CHAIN: {
394-
player = BufferIO::ReadUInt8(pbuf);
395-
count = BufferIO::ReadUInt8(pbuf);
394+
player = BufferIO::Read<uint8_t>(pbuf);
395+
count = BufferIO::Read<uint8_t>(pbuf);
396396
pbuf += 9 + count * 14;
397397
return ReadReplayResponse();
398398
}
@@ -445,9 +445,9 @@ bool ReplayMode::ReplayAnalyze(unsigned char* msg, unsigned int len) {
445445
break;
446446
}
447447
case MSG_CONFIRM_CARDS: {
448-
player = BufferIO::ReadUInt8(pbuf);
448+
player = BufferIO::Read<uint8_t>(pbuf);
449449
pbuf += 1;
450-
count = BufferIO::ReadUInt8(pbuf);
450+
count = BufferIO::Read<uint8_t>(pbuf);
451451
pbuf += count * 7;
452452
DuelClient::ClientAnalyze(offset, pbuf - offset);
453453
break;

‎gframe/single_duel.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -748,8 +748,8 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
748748
return 1;
749749
}
750750
case MSG_SELECT_CHAIN: {
751-
player = BufferIO::ReadUInt8(pbuf);
752-
count = BufferIO::ReadUInt8(pbuf);
751+
player = BufferIO::Read<uint8_t>(pbuf);
752+
count = BufferIO::Read<uint8_t>(pbuf);
753753
pbuf += 9 + count * 14;
754754
WaitforResponse(player);
755755
NetServer::SendBufferToPlayer(players[player], STOC_GAME_MSG, offset, pbuf - offset);
@@ -820,9 +820,9 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
820820
break;
821821
}
822822
case MSG_CONFIRM_CARDS: {
823-
player = BufferIO::ReadUInt8(pbuf);
823+
player = BufferIO::Read<uint8_t>(pbuf);
824824
pbuf += 1;
825-
count = BufferIO::ReadUInt8(pbuf);
825+
count = BufferIO::Read<uint8_t>(pbuf);
826826
if(pbuf[5] != LOCATION_DECK) {
827827
pbuf += count * 7;
828828
NetServer::SendBufferToPlayer(players[player], STOC_GAME_MSG, offset, pbuf - offset);

‎gframe/single_mode.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,8 @@ bool SingleMode::SinglePlayAnalyze(unsigned char* msg, unsigned int len) {
299299
break;
300300
}
301301
case MSG_SELECT_CHAIN: {
302-
player = BufferIO::ReadUInt8(pbuf);
303-
count = BufferIO::ReadUInt8(pbuf);
302+
player = BufferIO::Read<uint8_t>(pbuf);
303+
count = BufferIO::Read<uint8_t>(pbuf);
304304
pbuf += 9 + count * 14;
305305
if(!DuelClient::ClientAnalyze(offset, pbuf - offset)) {
306306
mainGame->singleSignal.Reset();
@@ -377,9 +377,9 @@ bool SingleMode::SinglePlayAnalyze(unsigned char* msg, unsigned int len) {
377377
break;
378378
}
379379
case MSG_CONFIRM_CARDS: {
380-
player = BufferIO::ReadUInt8(pbuf);
380+
player = BufferIO::Read<uint8_t>(pbuf);
381381
pbuf += 1;
382-
count = BufferIO::ReadUInt8(pbuf);
382+
count = BufferIO::Read<uint8_t>(pbuf);
383383
pbuf += count * 7;
384384
DuelClient::ClientAnalyze(offset, pbuf - offset);
385385
break;

‎gframe/tag_duel.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -704,8 +704,8 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
704704
return 1;
705705
}
706706
case MSG_SELECT_CHAIN: {
707-
player = BufferIO::ReadUInt8(pbuf);
708-
count = BufferIO::ReadUInt8(pbuf);
707+
player = BufferIO::Read<uint8_t>(pbuf);
708+
count = BufferIO::Read<uint8_t>(pbuf);
709709
pbuf += 9 + count * 14;
710710
WaitforResponse(player);
711711
NetServer::SendBufferToPlayer(cur_player[player], STOC_GAME_MSG, offset, pbuf - offset);
@@ -780,9 +780,9 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
780780
break;
781781
}
782782
case MSG_CONFIRM_CARDS: {
783-
player = BufferIO::ReadUInt8(pbuf);
783+
player = BufferIO::Read<uint8_t>(pbuf);
784784
pbuf += 1;
785-
count = BufferIO::ReadUInt8(pbuf);
785+
count = BufferIO::Read<uint8_t>(pbuf);
786786
if(pbuf[5] != LOCATION_DECK) {
787787
pbuf += count * 7;
788788
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);

0 commit comments

Comments
 (0)