Skip to content

Y
ygopro
Commit 85793b71 authored by Chen Bill's avatar Chen Bill Committed by GitHub
Browse files
Options

replace intN macro (#2627) 

* remove int32

* replace uint32_t

* remove uint8
parent 7721bfe0
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
gframe/client_card.cpp
View file @ 85793b71
......@@ -215,8 +215,8 @@ void ClientCard::ClearData() {
bool ClientCard::client_card_sort(ClientCard* c1, ClientCard* c2) {
if(c1->is_selected != c2->is_selected)
return c1->is_selected < c2->is_selected;
int32 cp1 = c1->overlayTarget ? c1->overlayTarget->controler : c1->controler;
int32 cp2 = c2->overlayTarget ? c2->overlayTarget->controler : c2->controler;
int cp1 = c1->overlayTarget ? c1->overlayTarget->controler : c1->controler;
int cp2 = c2->overlayTarget ? c2->overlayTarget->controler : c2->controler;
if(cp1 != cp2)
return cp1 < cp2;
if(c1->location != c2->location)
......
gframe/client_card.h
View file @ 85793b71
......@@ -15,7 +15,7 @@ struct CardDataC : card_data {
unsigned int ot{};
unsigned int category{};
bool is_setcodes(std::vector <uint32> values) const {
bool is_setcodes(std::vector <uint32_t> values) const {
for (auto& value : values) {
if (is_setcode(value))
return true;
......
gframe/data_manager.cpp
View file @ 85793b71
......@@ -385,7 +385,7 @@ std::wstring DataManager::FormatLinkMarker(unsigned int link_marker) const {
buffer.append(L"[\u2198]");
return buffer;
}
uint32 DataManager::CardReader(uint32 code, card_data* pData) {
uint32_t DataManager::CardReader(uint32_t code, card_data* pData) {
if (!dataManager.GetData(code, pData))
pData->clear();
return 0;
......
gframe/data_manager.h
View file @ 85793b71
......@@ -52,7 +52,7 @@ public:
static unsigned char scriptBuffer[0x20000];
static const wchar_t* unknown_string;
static uint32 CardReader(uint32, card_data*);
static uint32_t CardReader(uint32_t, card_data*);
static unsigned char* ScriptReaderEx(const char* script_name, int* slen);
static unsigned char* ScriptReader(const char* script_name, int* slen);
static IFileSystem* FileSystem;
......
gframe/event_handler.cpp
View file @ 85793b71
......@@ -567,7 +567,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
wchar_t formatBuffer[2048];
switch(command_location) {
case LOCATION_DECK: {
for(int32 i = (int32)deck[command_controler].size() - 1; i >= 0 ; --i)
for(int i = (int)deck[command_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(deck[command_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1000), deck[command_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
......@@ -575,28 +575,28 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
}
case LOCATION_MZONE: {
ClientCard* pcard = mzone[command_controler][command_sequence];
for(int32 i = 0; i < (int32)pcard->overlayed.size(); ++i)
for(int i = 0; i < (int)pcard->overlayed.size(); ++i)
selectable_cards.push_back(pcard->overlayed[i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), pcard->overlayed.size());
mainGame->wCardSelect->setText(formatBuffer);
break;
}
case LOCATION_GRAVE: {
for(int32 i = (int32)grave[command_controler].size() - 1; i >= 0 ; --i)
for(int i = (int)grave[command_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(grave[command_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[command_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
break;
}
case LOCATION_REMOVED: {
for(int32 i = (int32)remove[command_controler].size() - 1; i >= 0 ; --i)
for(int i = (int)remove[command_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(remove[command_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[command_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
break;
}
case LOCATION_EXTRA: {
for(int32 i = (int32)extra[command_controler].size() - 1; i >= 0 ; --i)
for(int i = (int)extra[command_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(extra[command_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[command_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
......@@ -1098,7 +1098,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case LOCATION_DECK: {
if(deck[hovered_controler].size() == 0)
break;
for(int32 i = (int32)deck[hovered_controler].size() - 1; i >= 0 ; --i)
for(int i = (int)deck[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(deck[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1000), deck[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
......@@ -1107,7 +1107,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case LOCATION_MZONE: {
if(!clicked_card || clicked_card->overlayed.size() == 0)
break;
for(int32 i = 0; i < (int32)clicked_card->overlayed.size(); ++i)
for(int i = 0; i < (int)clicked_card->overlayed.size(); ++i)
selectable_cards.push_back(clicked_card->overlayed[i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), clicked_card->overlayed.size());
mainGame->wCardSelect->setText(formatBuffer);
......@@ -1116,7 +1116,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case LOCATION_GRAVE: {
if(grave[hovered_controler].size() == 0)
break;
for(int32 i = (int32)grave[hovered_controler].size() - 1; i >= 0 ; --i)
for(int i = (int)grave[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(grave[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
......@@ -1125,7 +1125,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case LOCATION_REMOVED: {
if(remove[hovered_controler].size() == 0)
break;
for(int32 i = (int32)remove[hovered_controler].size() - 1; i >= 0 ; --i)
for(int i = (int)remove[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(remove[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
......@@ -1134,7 +1134,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case LOCATION_EXTRA: {
if(extra[hovered_controler].size() == 0)
break;
for(int32 i = (int32)extra[hovered_controler].size() - 1; i >= 0 ; --i)
for(int i = (int)extra[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(extra[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
......@@ -1153,7 +1153,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case LOCATION_MZONE: {
if(!clicked_card || clicked_card->overlayed.size() == 0)
break;
for(int32 i = 0; i < (int32)clicked_card->overlayed.size(); ++i)
for(int i = 0; i < (int)clicked_card->overlayed.size(); ++i)
selectable_cards.push_back(clicked_card->overlayed[i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), clicked_card->overlayed.size());
mainGame->wCardSelect->setText(formatBuffer);
......@@ -1162,7 +1162,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case LOCATION_GRAVE: {
if(grave[hovered_controler].size() == 0)
break;
for(int32 i = (int32)grave[hovered_controler].size() - 1; i >= 0 ; --i)
for(int i = (int)grave[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(grave[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
......@@ -1171,7 +1171,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case LOCATION_REMOVED: {
if (remove[hovered_controler].size() == 0)
break;
for (int32 i = (int32)remove[hovered_controler].size() - 1; i >= 0; --i)
for (int i = (int)remove[hovered_controler].size() - 1; i >= 0; --i)
selectable_cards.push_back(remove[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
......@@ -1180,7 +1180,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case LOCATION_EXTRA: {
if (extra[hovered_controler].size() == 0)
break;
for (int32 i = (int32)extra[hovered_controler].size() - 1; i >= 0; --i)
for (int i = (int)extra[hovered_controler].size() - 1; i >= 0; --i)
selectable_cards.push_back(extra[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[hovered_controler].size());
mainGame->wCardSelect->setText(formatBuffer);
......
gframe/replay_mode.cpp
View file @ 85793b71
......@@ -937,7 +937,7 @@ void ReplayMode::ReplayReload() {
ReloadLocation(0, LOCATION_REMOVED, flag, queryBuffer);
ReloadLocation(1, LOCATION_REMOVED, flag, queryBuffer);
}
uint32 ReplayMode::MessageHandler(intptr_t fduel, uint32 type) {
uint32_t ReplayMode::MessageHandler(intptr_t fduel, uint32_t type) {
if(!enable_log)
return 0;
char msgbuf[1024];
......
gframe/replay_mode.h
View file @ 85793b71
......@@ -47,7 +47,7 @@ public:
static void ReplayRefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
static void ReplayReload();
static uint32 MessageHandler(intptr_t fduel, uint32 type);
static uint32_t MessageHandler(intptr_t fduel, uint32_t type);
};
}
......
gframe/single_duel.cpp
View file @ 85793b71
......@@ -449,22 +449,22 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
last_replay.WriteInt32(opt, false);
last_replay.Flush();
last_replay.WriteInt32(pdeck[0].main.size(), false);
for(int32 i = (int32)pdeck[0].main.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[0].main.size() - 1; i >= 0; --i) {
new_card(pduel, pdeck[0].main[i]->first, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(pdeck[0].main[i]->first, false);
}
last_replay.WriteInt32(pdeck[0].extra.size(), false);
for(int32 i = (int32)pdeck[0].extra.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[0].extra.size() - 1; i >= 0; --i) {
new_card(pduel, pdeck[0].extra[i]->first, 0, 0, LOCATION_EXTRA, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(pdeck[0].extra[i]->first, false);
}
last_replay.WriteInt32(pdeck[1].main.size(), false);
for(int32 i = (int32)pdeck[1].main.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[1].main.size() - 1; i >= 0; --i) {
new_card(pduel, pdeck[1].main[i]->first, 1, 1, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(pdeck[1].main[i]->first, false);
}
last_replay.WriteInt32(pdeck[1].extra.size(), false);
for(int32 i = (int32)pdeck[1].extra.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[1].extra.size() - 1; i >= 0; --i) {
new_card(pduel, pdeck[1].extra[i]->first, 1, 1, LOCATION_EXTRA, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(pdeck[1].extra[i]->first, false);
}
......@@ -567,7 +567,7 @@ void SingleDuel::Surrender(DuelPlayer* dp) {
if(dp->type > 1 || !pduel)
return;
unsigned char wbuf[3];
uint32 player = dp->type;
uint32_t player = dp->type;
wbuf[0] = MSG_WIN;
wbuf[1] = 1 - player;
wbuf[2] = 0;
......@@ -1584,7 +1584,7 @@ void SingleDuel::RefreshSingle(int player, int location, int sequence, int flag)
for (auto pit = observers.begin(); pit != observers.end(); ++pit)
NetServer::ReSendToPlayer(*pit);
}
uint32 SingleDuel::MessageHandler(intptr_t fduel, uint32 type) {
uint32_t SingleDuel::MessageHandler(intptr_t fduel, uint32_t type) {
if(!enable_log)
return 0;
char msgbuf[1024];
......@@ -1597,7 +1597,7 @@ void SingleDuel::SingleTimer(evutil_socket_t fd, short events, void* arg) {
sd->time_elapsed++;
if(sd->time_elapsed >= sd->time_limit[sd->last_response] || sd->time_limit[sd->last_response] <= 0) {
unsigned char wbuf[3];
uint32 player = sd->last_response;
uint32_t player = sd->last_response;
wbuf[0] = MSG_WIN;
wbuf[1] = 1 - player;
wbuf[2] = 0x3;
......
gframe/single_duel.h
View file @ 85793b71
......@@ -38,7 +38,7 @@ public:
void RefreshExtra(int player, int flag = 0xe81fff, int use_cache = 1);
void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
static uint32 MessageHandler(intptr_t fduel, uint32 type);
static uint32_t MessageHandler(intptr_t fduel, uint32_t type);
static void SingleTimer(evutil_socket_t fd, short events, void* arg);
private:
......
gframe/single_mode.cpp
View file @ 85793b71
......@@ -834,7 +834,7 @@ void SingleMode::SinglePlayReload() {
ReloadLocation(0, LOCATION_REMOVED, flag, queryBuffer);
ReloadLocation(1, LOCATION_REMOVED, flag, queryBuffer);
}
uint32 SingleMode::MessageHandler(intptr_t fduel, uint32 type) {
uint32_t SingleMode::MessageHandler(intptr_t fduel, uint32_t type) {
if(!enable_log)
return 0;
char msgbuf[1024];
......
gframe/single_mode.h
View file @ 85793b71
......@@ -30,7 +30,7 @@ public:
static void SinglePlayRefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
static void SinglePlayReload();
static uint32 MessageHandler(intptr_t fduel, uint32 type);
static uint32_t MessageHandler(intptr_t fduel, uint32_t type);
protected:
static Replay last_replay;
......
gframe/tag_duel.cpp
View file @ 85793b71
......@@ -185,7 +185,7 @@ void TagDuel::ToDuelist(DuelPlayer* dp) {
} else {
if(ready[dp->type])
return;
uint8 dptype = (dp->type + 1) % 4;
unsigned char dptype = (dp->type + 1) % 4;
while(players[dptype])
dptype = (dptype + 1) % 4;
STOC_HS_PlayerChange scpc;
......@@ -428,45 +428,45 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
last_replay.Flush();
//
last_replay.WriteInt32(pdeck[0].main.size(), false);
for(int32 i = (int32)pdeck[0].main.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[0].main.size() - 1; i >= 0; --i) {
new_card(pduel, pdeck[0].main[i]->first, 0, 0, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(pdeck[0].main[i]->first, false);
}
last_replay.WriteInt32(pdeck[0].extra.size(), false);
for(int32 i = (int32)pdeck[0].extra.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[0].extra.size() - 1; i >= 0; --i) {
new_card(pduel, pdeck[0].extra[i]->first, 0, 0, LOCATION_EXTRA, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(pdeck[0].extra[i]->first, false);
}
//
last_replay.WriteInt32(pdeck[1].main.size(), false);
for(int32 i = (int32)pdeck[1].main.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[1].main.size() - 1; i >= 0; --i) {
new_tag_card(pduel, pdeck[1].main[i]->first, 0, LOCATION_DECK);
last_replay.WriteInt32(pdeck[1].main[i]->first, false);
}
last_replay.WriteInt32(pdeck[1].extra.size(), false);
for(int32 i = (int32)pdeck[1].extra.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[1].extra.size() - 1; i >= 0; --i) {
new_tag_card(pduel, pdeck[1].extra[i]->first, 0, LOCATION_EXTRA);
last_replay.WriteInt32(pdeck[1].extra[i]->first, false);
}
//
last_replay.WriteInt32(pdeck[3].main.size(), false);
for(int32 i = (int32)pdeck[3].main.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[3].main.size() - 1; i >= 0; --i) {
new_card(pduel, pdeck[3].main[i]->first, 1, 1, LOCATION_DECK, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(pdeck[3].main[i]->first, false);
}
last_replay.WriteInt32(pdeck[3].extra.size(), false);
for(int32 i = (int32)pdeck[3].extra.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[3].extra.size() - 1; i >= 0; --i) {
new_card(pduel, pdeck[3].extra[i]->first, 1, 1, LOCATION_EXTRA, 0, POS_FACEDOWN_DEFENSE);
last_replay.WriteInt32(pdeck[3].extra[i]->first, false);
}
//
last_replay.WriteInt32(pdeck[2].main.size(), false);
for(int32 i = (int32)pdeck[2].main.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[2].main.size() - 1; i >= 0; --i) {
new_tag_card(pduel, pdeck[2].main[i]->first, 1, LOCATION_DECK);
last_replay.WriteInt32(pdeck[2].main[i]->first, false);
}
last_replay.WriteInt32(pdeck[2].extra.size(), false);
for(int32 i = (int32)pdeck[2].extra.size() - 1; i >= 0; --i) {
for(int i = (int)pdeck[2].extra.size() - 1; i >= 0; --i) {
new_tag_card(pduel, pdeck[2].extra[i]->first, 1, LOCATION_EXTRA);
last_replay.WriteInt32(pdeck[2].extra[i]->first, false);
}
......@@ -536,18 +536,18 @@ void TagDuel::DuelEndProc() {
void TagDuel::Surrender(DuelPlayer* dp) {
if(dp->type > 3 || !pduel)
return;
uint32 player = dp->type;
uint32_t player = dp->type;
if(surrender[player])
return;
static const uint32 teammatemap[] = { 1, 0, 3, 2 };
uint32 teammate = teammatemap[player];
static const uint32_t teammatemap[] = { 1, 0, 3, 2 };
uint32_t teammate = teammatemap[player];
if(!surrender[teammate]) {
surrender[player] = true;
NetServer::SendPacketToPlayer(players[player], STOC_TEAMMATE_SURRENDER);
NetServer::SendPacketToPlayer(players[teammate], STOC_TEAMMATE_SURRENDER);
return;
}
static const uint32 winplayermap[] = { 1, 1, 0, 0 };
static const uint32_t winplayermap[] = { 1, 1, 0, 0 };
unsigned char wbuf[3];
wbuf[0] = MSG_WIN;
wbuf[1] = winplayermap[player];
......@@ -1731,7 +1731,7 @@ void TagDuel::RefreshSingle(int player, int location, int sequence, int flag) {
}
}
}
uint32 TagDuel::MessageHandler(intptr_t fduel, uint32 type) {
uint32_t TagDuel::MessageHandler(intptr_t fduel, uint32_t type) {
if(!enable_log)
return 0;
char msgbuf[1024];
......@@ -1744,7 +1744,7 @@ void TagDuel::TagTimer(evutil_socket_t fd, short events, void* arg) {
sd->time_elapsed++;
if(sd->time_elapsed >= sd->time_limit[sd->last_response] || sd->time_limit[sd->last_response] <= 0) {
unsigned char wbuf[3];
uint32 player = sd->last_response;
uint32_t player = sd->last_response;
wbuf[0] = MSG_WIN;
wbuf[1] = 1 - player;
wbuf[2] = 0x3;
......
gframe/tag_duel.h
View file @ 85793b71
......@@ -38,7 +38,7 @@ public:
void RefreshExtra(int player, int flag = 0xe81fff, int use_cache = 1);
void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
static uint32 MessageHandler(intptr_t fduel, uint32 type);
static uint32_t MessageHandler(intptr_t fduel, uint32_t type);
static void TagTimer(evutil_socket_t fd, short events, void* arg);
private:
......
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