Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More type conversion warning cleanup.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2010-11-07 12:00:23 +00:00
parent 5d907f5abe
commit a053c0d59e
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/mtg/src/GuiHand.cpp
View File

@@ -109,19 +109,19 @@ void GuiHandSelf::Repos()
if (OptionHandDirection::HORIZONTAL == options[Options::HANDDIRECTION].number)
{
y = SCREEN_WIDTH - 30;
float dist = 240.0 / cards.size(); if (dist > 30) dist = 30; else y = SCREEN_WIDTH - 15;
float dist = 240.0f / cards.size(); if (dist > 30) dist = 30; else y = SCREEN_WIDTH - 15;
for (vector<CardView*>::reverse_iterator it = cards.rbegin(); it != cards.rend(); ++it)
{
(*it)->x = y;
(*it)->y = SCREEN_HEIGHT - 30;
y -= dist;
(*it)->alpha = (q ? 0 : 255);
(*it)->alpha = static_cast<float>(q ? 0 : 255);
}
backpos.x = y + SCREEN_HEIGHT - 14;
}
else
{
float dist = 224.0 / ((cards.size() + 1) / 2); if (dist > 65) dist = 65;
float dist = 224.0f / ((cards.size() + 1) / 2); if (dist > 65) dist = 65;
bool flip = false;
for (vector<CardView*>::iterator it = cards.begin(); it != cards.end(); ++it)
{
@@ -129,7 +129,7 @@ void GuiHandSelf::Repos()
(*it)->y = y;
if (flip) y += dist;
flip = !flip;
(*it)->alpha = (q ? 0 : 255);
(*it)->alpha = static_cast<float>(q ? 0 : 255);
}
}
}