mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-02 11:02:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6393 from leoetlino/warning-fixes

Browse Source 
Qt: Warning fixes
This commit is contained in:
JosJuice 2018-02-22 18:13:09 +01:00 committed by GitHub
commit c08f6f0c53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinQt2/Config/Mapping/MappingIndicator.cpp
View File

@ -171,7 +171,7 @@ void MappingIndicator::DrawStick()
// Emulated cursor position // Emulated cursor position
float virt_curx, virt_cury; float virt_curx, virt_cury;
if (abs(curx) < deadzone && abs(cury) < deadzone) if (std::abs(curx) < deadzone && std::abs(cury) < deadzone)
{ {
virt_curx = virt_cury = 0; virt_curx = virt_cury = 0;
} }
@ -182,7 +182,7 @@ void MappingIndicator::DrawStick()
} }
// Coordinates for an octagon // Coordinates for an octagon
std::array<QPointF, 8> radius_octagon = { std::array<QPointF, 8> radius_octagon = {{
QPointF(centerx, centery + stick_size), // Bottom QPointF(centerx, centery + stick_size), // Bottom
QPointF(centerx + stick_size / sqrt(2), centery + stick_size / sqrt(2)), // Bottom Right QPointF(centerx + stick_size / sqrt(2), centery + stick_size / sqrt(2)), // Bottom Right
QPointF(centerx + stick_size, centery), // Right QPointF(centerx + stick_size, centery), // Right
@ -191,7 +191,7 @@ void MappingIndicator::DrawStick()
QPointF(centerx - stick_size / sqrt(2), centery - stick_size / sqrt(2)), // Top Left QPointF(centerx - stick_size / sqrt(2), centery - stick_size / sqrt(2)), // Top Left
QPointF(centerx - stick_size, centery), // Left QPointF(centerx - stick_size, centery), // Left
QPointF(centerx - stick_size / sqrt(2), centery + stick_size / sqrt(2)) // Bottom Left QPointF(centerx - stick_size / sqrt(2), centery + stick_size / sqrt(2)) // Bottom Left
}; }};
QPainter p(this); QPainter p(this);
@ -233,12 +233,12 @@ void MappingIndicator::DrawMixedTriggers()
double r_bar_percent = r_analog; double r_bar_percent = r_analog;
double l_bar_percent = l_analog; double l_bar_percent = l_analog;
if (r_button && (r_button != r_analog) || (r_button == r_analog) && (r_analog > threshold)) if ((r_button && r_button != r_analog) || (r_button == r_analog && r_analog > threshold))
r_bar_percent = 1; r_bar_percent = 1;
else else
r_bar_percent *= 0.8; r_bar_percent *= 0.8;
if (l_button && (l_button != l_analog) || (l_button == l_analog) && (l_analog > threshold)) if ((l_button && l_button != l_analog) || (l_button == l_analog && l_analog > threshold))
l_bar_percent = 1; l_bar_percent = 1;
else else
l_bar_percent *= 0.8; l_bar_percent *= 0.8;