summaryrefslogtreecommitdiff
path: root/src/progs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-10-29 02:02:04 +0300
committerAndrei Karas <akaras@inbox.ru>2018-10-29 02:02:04 +0300
commita6d18b282ab916c6536dc25516affeb9200043b6 (patch)
tree9980735a47cb2118999fb4f4dceaa52bf9f4fae7 /src/progs
parent98c74738f21d7ae256f1273b6c1614ee64e2a3ad (diff)
downloadmv-a6d18b282ab916c6536dc25516affeb9200043b6.tar.gz
mv-a6d18b282ab916c6536dc25516affeb9200043b6.tar.bz2
mv-a6d18b282ab916c6536dc25516affeb9200043b6.tar.xz
mv-a6d18b282ab916c6536dc25516affeb9200043b6.zip
Fix code style.s20181102
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/manaplus/actions/actions.cpp2
-rw-r--r--src/progs/manaplus/actions/statusbar.cpp2
-rw-r--r--src/progs/manaplus/gui/viewport.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp
index 9c0188d20..322599791 100644
--- a/src/progs/manaplus/actions/actions.cpp
+++ b/src/progs/manaplus/actions/actions.cpp
@@ -938,7 +938,7 @@ impHandler(targetAttack)
}
}
- if ((target == nullptr) && (settings.targetingType == 0u))
+ if ((target == nullptr) && (settings.targetingType == 0U))
target = localPlayer->getTarget();
if (target == nullptr)
diff --git a/src/progs/manaplus/actions/statusbar.cpp b/src/progs/manaplus/actions/statusbar.cpp
index 90a3f74d8..e15694902 100644
--- a/src/progs/manaplus/actions/statusbar.cpp
+++ b/src/progs/manaplus/actions/statusbar.cpp
@@ -172,7 +172,7 @@ impHandler0(changeMapMode)
impHandler0(changeTrade)
{
unsigned int deflt = playerRelations.getDefault();
- if ((deflt & PlayerRelation::TRADE) != 0u)
+ if ((deflt & PlayerRelation::TRADE) != 0U)
{
if (localChatTab != nullptr)
{
diff --git a/src/progs/manaplus/gui/viewport.cpp b/src/progs/manaplus/gui/viewport.cpp
index 634bc3b25..d3ed684e2 100644
--- a/src/progs/manaplus/gui/viewport.cpp
+++ b/src/progs/manaplus/gui/viewport.cpp
@@ -412,7 +412,7 @@ bool Viewport::openContextMenu(const MouseEvent &event)
popupMenu->showPopup(eventX, eventY, mHoverSign);
return true;
}
- else if (settings.cameraMode != 0u)
+ else if (settings.cameraMode != 0U)
{
if (mMap == nullptr)
return false;
@@ -1041,7 +1041,7 @@ void Viewport::toggleCameraMode()
settings.cameraMode ++;
if (settings.cameraMode > 1)
settings.cameraMode = 0;
- if (settings.cameraMode == 0u)
+ if (settings.cameraMode == 0U)
{
mCameraRelativeX = 0;
mCameraRelativeY = 0;