Skip to content

Y
ygopro
Commit a77898ba authored by salix5's avatar salix5
Browse files
Options

remove warning C4018

parent 81b781d9
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
gframe/deck_con.cpp
View file @ a77898ba
...@@ -355,7 +355,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -355,7 +355,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
int catesel = mainGame->lstCategories->getSelected(); int catesel = mainGame->lstCategories->getSelected();
if(catesel != 2) if(catesel != 2)
mainGame->cbDMCategory->addItem(dataManager.GetSysString(1452)); mainGame->cbDMCategory->addItem(dataManager.GetSysString(1452));
for(int i = 4; i < mainGame->lstCategories->getItemCount(); i++) { for(int i = 4; i < (int)mainGame->lstCategories->getItemCount(); i++) {
if(i != catesel) if(i != catesel)
mainGame->cbDMCategory->addItem(mainGame->lstCategories->getListItem(i)); mainGame->cbDMCategory->addItem(mainGame->lstCategories->getListItem(i));
} }
...@@ -372,7 +372,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -372,7 +372,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
int catesel = mainGame->lstCategories->getSelected(); int catesel = mainGame->lstCategories->getSelected();
if(catesel != 2) if(catesel != 2)
mainGame->cbDMCategory->addItem(dataManager.GetSysString(1452)); mainGame->cbDMCategory->addItem(dataManager.GetSysString(1452));
for(int i = 4; i < mainGame->lstCategories->getItemCount(); i++) { for(int i = 4; i < (int)mainGame->lstCategories->getItemCount(); i++) {
if(i != catesel) if(i != catesel)
mainGame->cbDMCategory->addItem(mainGame->lstCategories->getListItem(i)); mainGame->cbDMCategory->addItem(mainGame->lstCategories->getListItem(i));
} }
...@@ -391,7 +391,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -391,7 +391,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame->lstCategories->addItem(catename); mainGame->lstCategories->addItem(catename);
catesel = mainGame->lstCategories->getItemCount() - 1; catesel = mainGame->lstCategories->getItemCount() - 1;
} else { } else {
for(int i = 3; i < mainGame->lstCategories->getItemCount(); i++) { for(int i = 3; i < (int)mainGame->lstCategories->getItemCount(); i++) {
if(!mywcsncasecmp(mainGame->lstCategories->getListItem(i), catename, 256)) { if(!mywcsncasecmp(mainGame->lstCategories->getListItem(i), catename, 256)) {
catesel = i; catesel = i;
mainGame->stACMessage->setText(dataManager.GetSysString(1474)); mainGame->stACMessage->setText(dataManager.GetSysString(1474));
...@@ -421,7 +421,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -421,7 +421,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
catesel = mainGame->lstCategories->getItemCount() - 1; catesel = mainGame->lstCategories->getItemCount() - 1;
} else { } else {
catesel = 0; catesel = 0;
for(int i = 3; i < mainGame->lstCategories->getItemCount(); i++) { for(int i = 3; i < (int)mainGame->lstCategories->getItemCount(); i++) {
if(!mywcsncasecmp(mainGame->lstCategories->getListItem(i), newcatename, 256)) { if(!mywcsncasecmp(mainGame->lstCategories->getListItem(i), newcatename, 256)) {
catesel = i; catesel = i;
mainGame->stACMessage->setText(dataManager.GetSysString(1474)); mainGame->stACMessage->setText(dataManager.GetSysString(1474));
...@@ -472,7 +472,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -472,7 +472,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
RefreshDeckList(); RefreshDeckList();
ChangeCategory(mainGame->lstCategories->getSelected()); ChangeCategory(mainGame->lstCategories->getSelected());
} }
for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) { for(int i = 0; i < (int)mainGame->lstDecks->getItemCount(); i++) {
if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) { if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) {
deckManager.LoadDeck(filepath); deckManager.LoadDeck(filepath);
prev_deck = i; prev_deck = i;
...@@ -506,7 +506,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -506,7 +506,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
} }
RefreshDeckList(); RefreshDeckList();
ChangeCategory(catesel); ChangeCategory(catesel);
for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) { for(int i = 0; i < (int)mainGame->lstDecks->getItemCount(); i++) {
if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), newdeckname, 256)) { if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), newdeckname, 256)) {
deckManager.LoadDeck(newfilepath); deckManager.LoadDeck(newfilepath);
prev_deck = i; prev_deck = i;
...@@ -570,7 +570,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -570,7 +570,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
RefreshDeckList(); RefreshDeckList();
mainGame->cbDBCategory->setSelected(catesel); mainGame->cbDBCategory->setSelected(catesel);
ChangeCategory(catesel); ChangeCategory(catesel);
for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) { for(int i = 0; i < (int)mainGame->lstDecks->getItemCount(); i++) {
if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) { if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) {
deckManager.LoadDeck(newfilepath); deckManager.LoadDeck(newfilepath);
prev_deck = i; prev_deck = i;
...@@ -608,7 +608,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -608,7 +608,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
RefreshDeckList(); RefreshDeckList();
mainGame->cbDBCategory->setSelected(catesel); mainGame->cbDBCategory->setSelected(catesel);
ChangeCategory(catesel); ChangeCategory(catesel);
for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) { for(int i = 0; i < (int)mainGame->lstDecks->getItemCount(); i++) {
if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) { if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) {
deckManager.LoadDeck(newfilepath); deckManager.LoadDeck(newfilepath);
prev_deck = i; prev_deck = i;
...@@ -1500,7 +1500,7 @@ void DeckBuilder::FilterCards() { ...@@ -1500,7 +1500,7 @@ void DeckBuilder::FilterCards() {
SortList(); SortList();
} }
void DeckBuilder::InstantSearch() { void DeckBuilder::InstantSearch() {
if(mainGame->gameConf.auto_search_limit >= 0 && (wcslen(mainGame->ebCardName->getText()) >= mainGame->gameConf.auto_search_limit)) if(mainGame->gameConf.auto_search_limit >= 0 && ((int)wcslen(mainGame->ebCardName->getText()) >= mainGame->gameConf.auto_search_limit))
StartFilter(); StartFilter();
} }
void DeckBuilder::ClearSearch() { void DeckBuilder::ClearSearch() {
......
gframe/event_handler.cpp
View file @ a77898ba
...@@ -328,7 +328,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -328,7 +328,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case BUTTON_ANNUMBER_11: case BUTTON_ANNUMBER_11:
case BUTTON_ANNUMBER_12: { case BUTTON_ANNUMBER_12: {
soundManager.PlaySoundEffect(SOUND_BUTTON); soundManager.PlaySoundEffect(SOUND_BUTTON);
for(int i = 0; i < mainGame->cbANNumber->getItemCount(); ++i) { for(int i = 0; i < (int)mainGame->cbANNumber->getItemCount(); ++i) {
if(id - BUTTON_ANNUMBER_1 + 1 == mainGame->cbANNumber->getItemData(i)) { if(id - BUTTON_ANNUMBER_1 + 1 == mainGame->cbANNumber->getItemData(i)) {
mainGame->cbANNumber->setSelected(i); mainGame->cbANNumber->setSelected(i);
break; break;
...@@ -1367,11 +1367,11 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1367,11 +1367,11 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
clicked_card->is_selected = true; clicked_card->is_selected = true;
selected_cards.push_back(clicked_card); selected_cards.push_back(clicked_card);
} }
if(selected_cards.size() >= select_max) { if((int)selected_cards.size() >= select_max) {
SetResponseSelectedCards(); SetResponseSelectedCards();
ShowCancelOrFinishButton(0); ShowCancelOrFinishButton(0);
DuelClient::SendResponse(); DuelClient::SendResponse();
} else if(selected_cards.size() >= select_min) { } else if((int)selected_cards.size() >= select_min) {
if(selected_cards.size() == selectable_cards.size()) { if(selected_cards.size() == selectable_cards.size()) {
SetResponseSelectedCards(); SetResponseSelectedCards();
ShowCancelOrFinishButton(0); ShowCancelOrFinishButton(0);
......
gframe/game.cpp
View file @ a77898ba
...@@ -719,7 +719,7 @@ bool Game::Initialize() { ...@@ -719,7 +719,7 @@ bool Game::Initialize() {
int catewidth = 0; int catewidth = 0;
for(int i = 0; i < 32; ++i) { for(int i = 0; i < 32; ++i) {
irr::core::dimension2d<unsigned int> dtxt = mainGame->guiFont->getDimension(dataManager.GetSysString(1100 + i)); irr::core::dimension2d<unsigned int> dtxt = mainGame->guiFont->getDimension(dataManager.GetSysString(1100 + i));
if(dtxt.Width + 40 > catewidth) if((int)dtxt.Width + 40 > catewidth)
catewidth = dtxt.Width + 40; catewidth = dtxt.Width + 40;
} }
for(int i = 0; i < 32; ++i) for(int i = 0; i < 32; ++i)
......
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