Skip to content

Y
ygopro
Commit 31bd9394 authored by Chen Bill's avatar Chen Bill Committed by GitHub
Browse files
Options

remove warning 4267 (#2529)

parent e3ea0909
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
gframe/client_field.cpp
View file @ 31bd9394
...@@ -192,7 +192,7 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se ...@@ -192,7 +192,7 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
case LOCATION_DECK: { case LOCATION_DECK: {
if (sequence != 0 || deck[controler].size() == 0) { if (sequence != 0 || deck[controler].size() == 0) {
deck[controler].push_back(pcard); deck[controler].push_back(pcard);
pcard->sequence = deck[controler].size() - 1; pcard->sequence = (unsigned char)(deck[controler].size() - 1);
} else { } else {
deck[controler].push_back(0); deck[controler].push_back(0);
for(int i = deck[controler].size() - 1; i > 0; --i) { for(int i = deck[controler].size() - 1; i > 0; --i) {
...@@ -207,7 +207,7 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se ...@@ -207,7 +207,7 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
} }
case LOCATION_HAND: { case LOCATION_HAND: {
hand[controler].push_back(pcard); hand[controler].push_back(pcard);
pcard->sequence = hand[controler].size() - 1; pcard->sequence = (unsigned char)(hand[controler].size() - 1);
break; break;
} }
case LOCATION_MZONE: { case LOCATION_MZONE: {
...@@ -220,18 +220,18 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se ...@@ -220,18 +220,18 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
} }
case LOCATION_GRAVE: { case LOCATION_GRAVE: {
grave[controler].push_back(pcard); grave[controler].push_back(pcard);
pcard->sequence = grave[controler].size() - 1; pcard->sequence = (unsigned char)(grave[controler].size() - 1);
break; break;
} }
case LOCATION_REMOVED: { case LOCATION_REMOVED: {
remove[controler].push_back(pcard); remove[controler].push_back(pcard);
pcard->sequence = remove[controler].size() - 1; pcard->sequence = (unsigned char)(remove[controler].size() - 1);
break; break;
} }
case LOCATION_EXTRA: { case LOCATION_EXTRA: {
if(extra_p_count[controler] == 0 || (pcard->position & POS_FACEUP)) { if(extra_p_count[controler] == 0 || (pcard->position & POS_FACEUP)) {
extra[controler].push_back(pcard); extra[controler].push_back(pcard);
pcard->sequence = extra[controler].size() - 1; pcard->sequence = (unsigned char)(extra[controler].size() - 1);
} else { } else {
extra[controler].push_back(0); extra[controler].push_back(0);
int p = extra[controler].size() - extra_p_count[controler] - 1; int p = extra[controler].size() - extra_p_count[controler] - 1;
......
gframe/duelclient.cpp
View file @ 31bd9394
...@@ -2641,7 +2641,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) { ...@@ -2641,7 +2641,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
mainGame->dField.overlay_cards.insert(pcard); mainGame->dField.overlay_cards.insert(pcard);
pcard->overlayTarget = olcard; pcard->overlayTarget = olcard;
pcard->location = LOCATION_OVERLAY; pcard->location = LOCATION_OVERLAY;
pcard->sequence = olcard->overlayed.size() - 1; pcard->sequence = (unsigned char)(olcard->overlayed.size() - 1);
} else { } else {
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->dField.RemoveCard(pc, pl, ps); mainGame->dField.RemoveCard(pc, pl, ps);
...@@ -2650,7 +2650,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) { ...@@ -2650,7 +2650,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
pcard->overlayTarget = olcard; pcard->overlayTarget = olcard;
pcard->location = LOCATION_OVERLAY; pcard->location = LOCATION_OVERLAY;
pcard->sequence = olcard->overlayed.size() - 1; pcard->sequence = (unsigned char)(olcard->overlayed.size() - 1);
if (olcard->location == LOCATION_MZONE) { if (olcard->location == LOCATION_MZONE) {
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->dField.MoveCard(pcard, 10); mainGame->dField.MoveCard(pcard, 10);
...@@ -2671,7 +2671,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) { ...@@ -2671,7 +2671,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
mainGame->dField.AddCard(pcard, cc, cl, cs); mainGame->dField.AddCard(pcard, cc, cl, cs);
mainGame->dField.overlay_cards.erase(pcard); mainGame->dField.overlay_cards.erase(pcard);
for (size_t i = 0; i < olcard->overlayed.size(); ++i) for (size_t i = 0; i < olcard->overlayed.size(); ++i)
olcard->overlayed[i]->sequence = i; olcard->overlayed[i]->sequence = (unsigned char)i;
} else { } else {
mainGame->gMutex.lock(); mainGame->gMutex.lock();
olcard->overlayed.erase(olcard->overlayed.begin() + pcard->sequence); olcard->overlayed.erase(olcard->overlayed.begin() + pcard->sequence);
...@@ -2680,7 +2680,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) { ...@@ -2680,7 +2680,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
mainGame->dField.AddCard(pcard, cc, cl, cs); mainGame->dField.AddCard(pcard, cc, cl, cs);
mainGame->dField.overlay_cards.erase(pcard); mainGame->dField.overlay_cards.erase(pcard);
for (size_t i = 0; i < olcard->overlayed.size(); ++i) { for (size_t i = 0; i < olcard->overlayed.size(); ++i) {
olcard->overlayed[i]->sequence = i; olcard->overlayed[i]->sequence = (unsigned char)i;
mainGame->dField.MoveCard(olcard->overlayed[i], 2); mainGame->dField.MoveCard(olcard->overlayed[i], 2);
} }
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
...@@ -2697,21 +2697,21 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) { ...@@ -2697,21 +2697,21 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
if(mainGame->dInfo.isReplay && mainGame->dInfo.isReplaySkiping) { if(mainGame->dInfo.isReplay && mainGame->dInfo.isReplaySkiping) {
olcard1->overlayed.erase(olcard1->overlayed.begin() + pcard->sequence); olcard1->overlayed.erase(olcard1->overlayed.begin() + pcard->sequence);
olcard2->overlayed.push_back(pcard); olcard2->overlayed.push_back(pcard);
pcard->sequence = olcard2->overlayed.size() - 1; pcard->sequence = (unsigned char)(olcard2->overlayed.size() - 1);
pcard->location = LOCATION_OVERLAY; pcard->location = LOCATION_OVERLAY;
pcard->overlayTarget = olcard2; pcard->overlayTarget = olcard2;
for (size_t i = 0; i < olcard1->overlayed.size(); ++i) { for (size_t i = 0; i < olcard1->overlayed.size(); ++i) {
olcard1->overlayed[i]->sequence = i; olcard1->overlayed[i]->sequence = (unsigned char)i;
} }
} else { } else {
mainGame->gMutex.lock(); mainGame->gMutex.lock();
olcard1->overlayed.erase(olcard1->overlayed.begin() + pcard->sequence); olcard1->overlayed.erase(olcard1->overlayed.begin() + pcard->sequence);
olcard2->overlayed.push_back(pcard); olcard2->overlayed.push_back(pcard);
pcard->sequence = olcard2->overlayed.size() - 1; pcard->sequence = (unsigned char)(olcard2->overlayed.size() - 1);
pcard->location = LOCATION_OVERLAY; pcard->location = LOCATION_OVERLAY;
pcard->overlayTarget = olcard2; pcard->overlayTarget = olcard2;
for (size_t i = 0; i < olcard1->overlayed.size(); ++i) { for (size_t i = 0; i < olcard1->overlayed.size(); ++i) {
olcard1->overlayed[i]->sequence = i; olcard1->overlayed[i]->sequence = (unsigned char)i;
mainGame->dField.MoveCard(olcard1->overlayed[i], 2); mainGame->dField.MoveCard(olcard1->overlayed[i], 2);
} }
mainGame->dField.MoveCard(pcard, 10); mainGame->dField.MoveCard(pcard, 10);
...@@ -3747,7 +3747,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) { ...@@ -3747,7 +3747,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
ClientCard* ccard = new ClientCard; ClientCard* ccard = new ClientCard;
ccard->controler = player; ccard->controler = player;
ccard->location = LOCATION_DECK; ccard->location = LOCATION_DECK;
ccard->sequence = mainGame->dField.deck[player].size(); ccard->sequence = (unsigned char)mainGame->dField.deck[player].size();
mainGame->dField.deck[player].push_back(ccard); mainGame->dField.deck[player].push_back(ccard);
} }
} }
...@@ -3762,7 +3762,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) { ...@@ -3762,7 +3762,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
ClientCard* ccard = new ClientCard; ClientCard* ccard = new ClientCard;
ccard->controler = player; ccard->controler = player;
ccard->location = LOCATION_HAND; ccard->location = LOCATION_HAND;
ccard->sequence = mainGame->dField.hand[player].size(); ccard->sequence = (unsigned char)mainGame->dField.hand[player].size();
mainGame->dField.hand[player].push_back(ccard); mainGame->dField.hand[player].push_back(ccard);
} }
} }
...@@ -3777,7 +3777,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) { ...@@ -3777,7 +3777,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
ClientCard* ccard = new ClientCard; ClientCard* ccard = new ClientCard;
ccard->controler = player; ccard->controler = player;
ccard->location = LOCATION_EXTRA; ccard->location = LOCATION_EXTRA;
ccard->sequence = mainGame->dField.extra[player].size(); ccard->sequence = (unsigned char)mainGame->dField.extra[player].size();
mainGame->dField.extra[player].push_back(ccard); mainGame->dField.extra[player].push_back(ccard);
} }
} }
...@@ -3838,7 +3838,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) { ...@@ -3838,7 +3838,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
mainGame->dField.overlay_cards.insert(xcard); mainGame->dField.overlay_cards.insert(xcard);
xcard->overlayTarget = ccard; xcard->overlayTarget = ccard;
xcard->location = LOCATION_OVERLAY; xcard->location = LOCATION_OVERLAY;
xcard->sequence = ccard->overlayed.size() - 1; xcard->sequence = (unsigned char)(ccard->overlayed.size() - 1);
xcard->owner = p; xcard->owner = p;
xcard->controler = p; xcard->controler = p;
} }
......
gframe/single_duel.cpp
View file @ 31bd9394
...@@ -87,7 +87,7 @@ void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) { ...@@ -87,7 +87,7 @@ void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
dp->type = NETPLAYER_TYPE_OBSERVER; dp->type = NETPLAYER_TYPE_OBSERVER;
sctc.type |= NETPLAYER_TYPE_OBSERVER; sctc.type |= NETPLAYER_TYPE_OBSERVER;
STOC_HS_WatchChange scwc; STOC_HS_WatchChange scwc;
scwc.watch_count = observers.size(); scwc.watch_count = (unsigned short)observers.size();
if(players[0]) if(players[0])
NetServer::SendPacketToPlayer(players[0], STOC_HS_WATCH_CHANGE, scwc); NetServer::SendPacketToPlayer(players[0], STOC_HS_WATCH_CHANGE, scwc);
if(players[1]) if(players[1])
...@@ -121,7 +121,7 @@ void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) { ...@@ -121,7 +121,7 @@ void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
} }
if(observers.size()) { if(observers.size()) {
STOC_HS_WatchChange scwc; STOC_HS_WatchChange scwc;
scwc.watch_count = observers.size(); scwc.watch_count = (unsigned short)observers.size();
NetServer::SendPacketToPlayer(dp, STOC_HS_WATCH_CHANGE, scwc); NetServer::SendPacketToPlayer(dp, STOC_HS_WATCH_CHANGE, scwc);
} }
} }
...@@ -133,7 +133,7 @@ void SingleDuel::LeaveGame(DuelPlayer* dp) { ...@@ -133,7 +133,7 @@ void SingleDuel::LeaveGame(DuelPlayer* dp) {
observers.erase(dp); observers.erase(dp);
if(duel_stage == DUEL_STAGE_BEGIN) { if(duel_stage == DUEL_STAGE_BEGIN) {
STOC_HS_WatchChange scwc; STOC_HS_WatchChange scwc;
scwc.watch_count = observers.size(); scwc.watch_count = (unsigned short)observers.size();
if(players[0]) if(players[0])
NetServer::SendPacketToPlayer(players[0], STOC_HS_WATCH_CHANGE, scwc); NetServer::SendPacketToPlayer(players[0], STOC_HS_WATCH_CHANGE, scwc);
if(players[1]) if(players[1])
...@@ -199,7 +199,7 @@ void SingleDuel::ToDuelist(DuelPlayer* dp) { ...@@ -199,7 +199,7 @@ void SingleDuel::ToDuelist(DuelPlayer* dp) {
scpe.pos = 1; scpe.pos = 1;
} }
STOC_HS_WatchChange scwc; STOC_HS_WatchChange scwc;
scwc.watch_count = observers.size(); scwc.watch_count = (unsigned short)observers.size();
NetServer::SendPacketToPlayer(players[0], STOC_HS_PLAYER_ENTER, scpe); NetServer::SendPacketToPlayer(players[0], STOC_HS_PLAYER_ENTER, scpe);
NetServer::SendPacketToPlayer(players[0], STOC_HS_WATCH_CHANGE, scwc); NetServer::SendPacketToPlayer(players[0], STOC_HS_WATCH_CHANGE, scwc);
if(players[1]) { if(players[1]) {
...@@ -322,12 +322,12 @@ void SingleDuel::StartDuel(DuelPlayer* dp) { ...@@ -322,12 +322,12 @@ void SingleDuel::StartDuel(DuelPlayer* dp) {
} }
unsigned char deckbuff[12]; unsigned char deckbuff[12];
auto pbuf = deckbuff; auto pbuf = deckbuff;
BufferIO::WriteInt16(pbuf, pdeck[0].main.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[0].main.size());
BufferIO::WriteInt16(pbuf, pdeck[0].extra.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[0].extra.size());
BufferIO::WriteInt16(pbuf, pdeck[0].side.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[0].side.size());
BufferIO::WriteInt16(pbuf, pdeck[1].main.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[1].main.size());
BufferIO::WriteInt16(pbuf, pdeck[1].extra.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[1].extra.size());
BufferIO::WriteInt16(pbuf, pdeck[1].side.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[1].side.size());
NetServer::SendBufferToPlayer(players[0], STOC_DECK_COUNT, deckbuff, 12); NetServer::SendBufferToPlayer(players[0], STOC_DECK_COUNT, deckbuff, 12);
char tempbuff[6]; char tempbuff[6];
memcpy(tempbuff, deckbuff, 6); memcpy(tempbuff, deckbuff, 6);
......
gframe/tag_duel.cpp
View file @ 31bd9394
...@@ -85,7 +85,7 @@ void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) { ...@@ -85,7 +85,7 @@ void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
dp->type = NETPLAYER_TYPE_OBSERVER; dp->type = NETPLAYER_TYPE_OBSERVER;
sctc.type |= NETPLAYER_TYPE_OBSERVER; sctc.type |= NETPLAYER_TYPE_OBSERVER;
STOC_HS_WatchChange scwc; STOC_HS_WatchChange scwc;
scwc.watch_count = observers.size(); scwc.watch_count = (unsigned short)observers.size();
for(int i = 0; i < 4; ++i) for(int i = 0; i < 4; ++i)
if(players[i]) if(players[i])
NetServer::SendPacketToPlayer(players[i], STOC_HS_WATCH_CHANGE, scwc); NetServer::SendPacketToPlayer(players[i], STOC_HS_WATCH_CHANGE, scwc);
...@@ -108,7 +108,7 @@ void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) { ...@@ -108,7 +108,7 @@ void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
} }
if(observers.size()) { if(observers.size()) {
STOC_HS_WatchChange scwc; STOC_HS_WatchChange scwc;
scwc.watch_count = observers.size(); scwc.watch_count = (unsigned short)observers.size();
NetServer::SendPacketToPlayer(dp, STOC_HS_WATCH_CHANGE, scwc); NetServer::SendPacketToPlayer(dp, STOC_HS_WATCH_CHANGE, scwc);
} }
} }
...@@ -120,7 +120,7 @@ void TagDuel::LeaveGame(DuelPlayer* dp) { ...@@ -120,7 +120,7 @@ void TagDuel::LeaveGame(DuelPlayer* dp) {
observers.erase(dp); observers.erase(dp);
if(duel_stage == DUEL_STAGE_BEGIN) { if(duel_stage == DUEL_STAGE_BEGIN) {
STOC_HS_WatchChange scwc; STOC_HS_WatchChange scwc;
scwc.watch_count = observers.size(); scwc.watch_count = (unsigned short)observers.size();
for(int i = 0; i < 4; ++i) for(int i = 0; i < 4; ++i)
if(players[i]) if(players[i])
NetServer::SendPacketToPlayer(players[i], STOC_HS_WATCH_CHANGE, scwc); NetServer::SendPacketToPlayer(players[i], STOC_HS_WATCH_CHANGE, scwc);
...@@ -165,7 +165,7 @@ void TagDuel::ToDuelist(DuelPlayer* dp) { ...@@ -165,7 +165,7 @@ void TagDuel::ToDuelist(DuelPlayer* dp) {
players[dp->type] = dp; players[dp->type] = dp;
scpe.pos = dp->type; scpe.pos = dp->type;
STOC_HS_WatchChange scwc; STOC_HS_WatchChange scwc;
scwc.watch_count = observers.size(); scwc.watch_count = (unsigned short)observers.size();
for(int i = 0; i < 4; ++i) for(int i = 0; i < 4; ++i)
if(players[i]) { if(players[i]) {
NetServer::SendPacketToPlayer(players[i], STOC_HS_PLAYER_ENTER, scpe); NetServer::SendPacketToPlayer(players[i], STOC_HS_PLAYER_ENTER, scpe);
...@@ -286,12 +286,12 @@ void TagDuel::StartDuel(DuelPlayer* dp) { ...@@ -286,12 +286,12 @@ void TagDuel::StartDuel(DuelPlayer* dp) {
} }
unsigned char deckbuff[12]; unsigned char deckbuff[12];
auto pbuf = deckbuff; auto pbuf = deckbuff;
BufferIO::WriteInt16(pbuf, pdeck[0].main.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[0].main.size());
BufferIO::WriteInt16(pbuf, pdeck[0].extra.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[0].extra.size());
BufferIO::WriteInt16(pbuf, pdeck[0].side.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[0].side.size());
BufferIO::WriteInt16(pbuf, pdeck[2].main.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[2].main.size());
BufferIO::WriteInt16(pbuf, pdeck[2].extra.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[2].extra.size());
BufferIO::WriteInt16(pbuf, pdeck[2].side.size()); BufferIO::WriteInt16(pbuf, (short)pdeck[2].side.size());
NetServer::SendBufferToPlayer(players[0], STOC_DECK_COUNT, deckbuff, 12); NetServer::SendBufferToPlayer(players[0], STOC_DECK_COUNT, deckbuff, 12);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
char tempbuff[6]; char tempbuff[6];
......
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