ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #3236 (#3253)

Browse Source 
* Don't generate IRC alerts

* Fix #3236

* Update .appveyor.yml
This commit is contained in:
Alayan-stk-2 2018-05-16 01:16:56 +02:00 committed by auriamg
parent d4b3f75b22
commit f5245a679e
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/states_screens/race_gui_base.cpp
View File

@ -349,9 +349,27 @@ void RaceGUIBase::drawPowerupIcons(const AbstractKart* kart,
int itemSpacing = (int)(scale * 32.0f); int itemSpacing = (int)(scale * 32.0f);
int x1 = viewport.UpperLeftCorner.X + (viewport.getWidth()/2) int x1, y1;
// When there is not much height, move items on the side
if ((float) viewport.getWidth() / (float) viewport.getHeight() > 2.0f)
{
x1 = viewport.UpperLeftCorner.X + 3*(viewport.getWidth()/4)
- ((n * itemSpacing)/2); - ((n * itemSpacing)/2);
int y1 = viewport.UpperLeftCorner.Y + (int)(20 * scaling.Y); }
else
{
x1 = viewport.UpperLeftCorner.X + (viewport.getWidth()/2)
- ((n * itemSpacing)/2);
}
// When the viewport is smaller in splitscreen, reduce the top margin
if ((race_manager->getNumLocalPlayers() == 2 &&
viewport.getWidth() > viewport.getHeight()) ||
race_manager->getNumLocalPlayers() >= 3 )
y1 = viewport.UpperLeftCorner.Y + (int)(5 * scaling.Y);
else
y1 = viewport.UpperLeftCorner.Y + (int)(20 * scaling.Y);
int x2 = 0; int x2 = 0;