summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-06-24 01:59:01 +0300
committerAndrei Karas <akaras@inbox.ru>2019-06-24 01:59:01 +0300
commita6445adf61a87f73a3cd7781c36e36e228ac526e (patch)
tree6e291125a2fb15ae36e5c65af9b8bb1360b1eaea /src/gui
parentbdc467e9f8d7c72d912eb7fdc434b3a14b52d901 (diff)
downloadmv-a6445adf61a87f73a3cd7781c36e36e228ac526e.tar.gz
mv-a6445adf61a87f73a3cd7781c36e36e228ac526e.tar.bz2
mv-a6445adf61a87f73a3cd7781c36e36e228ac526e.tar.xz
mv-a6445adf61a87f73a3cd7781c36e36e228ac526e.zip
Fix code style
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/itempopup.cpp3
-rw-r--r--src/gui/popups/popupmenu.cpp1
-rw-r--r--src/gui/sdlinput.h2
3 files changed, 0 insertions, 6 deletions
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index e96d2845b..0e9dd031f 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -350,9 +350,6 @@ std::string ItemPopup::getCardsString(const int *const cards)
return label;
}
case CARD0_FORGE: // forged item
- {
- return label;
- }
case CARD0_PET:
{
return label;
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 435d35111..dcba43e1f 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -2082,7 +2082,6 @@ void PopupMenu::showAttackMonsterPopup(const int x, const int y,
break;
}
case MapItemType::IGNORE_:
- break;
default:
break;
}
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 65691e299..7c5bc5d30 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -320,8 +320,6 @@ class SDLInput final
value = KeyValue::RIGHT;
break;
case SDLK_RETURN:
- value = KeyValue::ENTER;
- break;
case SDLK_KP_ENTER:
value = KeyValue::ENTER;
break;