diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/being/being.cpp | 6 | ||||
| -rw-r--r-- | src/defaults.cpp | 2 | ||||
| -rw-r--r-- | src/enums/being/visiblenamepos.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_players.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/outfitwindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/outfitwindow.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index f924c4b47..6bbf50a48 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -144,7 +144,7 @@ Move Being::mMoveNames = Move_false; bool Being::mUseDiagonal = true; BadgeDrawType::Type Being::mShowBadges = BadgeDrawType::Top; int Being::mAwayEffect = -1; -VisibleNamePos::Type Being::mVisibleNamePos = VisibleNamePos::Buttom; +VisibleNamePos::Type Being::mVisibleNamePos = VisibleNamePos::Bottom; std::list<BeingCacheEntry*> beingInfoCache; typedef std::map<int, Guild*>::const_iterator GuildsMapCIter; @@ -2286,7 +2286,7 @@ void Being::updateBadgesPosition() else if (mShowBadges == BadgeDrawType::Bottom) { mBadgesX = px + 8 - mBadgesCount * 8; - if (mVisibleNamePos == VisibleNamePos::Buttom) + if (mVisibleNamePos == VisibleNamePos::Bottom) { mBadgesY = mDispName->getY(); } @@ -2315,7 +2315,7 @@ void Being::updateBadgesPosition() { mBadgesX = px + 8 - mBadgesCount * 8; const int height = settings.playerNameOffset; - if (mVisibleNamePos == VisibleNamePos::Buttom) + if (mVisibleNamePos == VisibleNamePos::Bottom) mBadgesY = py + height; else mBadgesY = py + height + 16; diff --git a/src/defaults.cpp b/src/defaults.cpp index d0412e397..e3b1f91c6 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -96,7 +96,7 @@ void setConfigDefaults(Configuration &cfg) AddDEF("speechBubbleAlpha", 1.0F); AddDEF("MostUsedServerName0", "server.themanaworld.org"); AddDEF("visiblenames", VisibleName::Show); - AddDEF("visiblenamespos", VisibleNamePos::Buttom); + AddDEF("visiblenamespos", VisibleNamePos::Bottom); AddDEF("speech", CAST_S32(BeingSpeech::NO_NAME_IN_BUBBLE)); AddDEF("showgender", true); AddDEF("showlevel", false); diff --git a/src/enums/being/visiblenamepos.h b/src/enums/being/visiblenamepos.h index 9c5ac6bd5..884c4eebe 100644 --- a/src/enums/being/visiblenamepos.h +++ b/src/enums/being/visiblenamepos.h @@ -26,7 +26,7 @@ namespace VisibleNamePos enum Type { Top = 0, - Buttom = 1 + Bottom = 1 }; } // namespace VisibleNamePos diff --git a/src/gui/widgets/tabs/setup_players.cpp b/src/gui/widgets/tabs/setup_players.cpp index c04f6fc67..6d964799d 100644 --- a/src/gui/widgets/tabs/setup_players.cpp +++ b/src/gui/widgets/tabs/setup_players.cpp @@ -70,7 +70,7 @@ static const char *const topDownList[] = // TRANSLATORS: show on top or down N_("top"), // TRANSLATORS: show on top or down - N_("buttom") + N_("bottom") }; Setup_Players::Setup_Players(const Widget2 *const widget) : diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 5a5608d4e..fa288c7d9 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -65,7 +65,7 @@ OutfitWindow::OutfitWindow() : // TRANSLATORS: outfits window button mNextButton(new Button(this, _(">"), "next", this)), // TRANSLATORS: outfits window button - mEquipButtom(new Button(this, _("Equip"), "equip", this)), + mEquipBottom(new Button(this, _("Equip"), "equip", this)), // TRANSLATORS: outfits window label mCurrentLabel(new Label(this, strprintf(_("Outfit: %d"), 1))), // TRANSLATORS: outfits window checkbox @@ -112,7 +112,7 @@ OutfitWindow::OutfitWindow() : mAwayOutfitCheck->setActionEventId("away"); mAwayOutfitCheck->addActionListener(this); - place(1, 3, mEquipButtom, 2); + place(1, 3, mEquipBottom, 2); place(0, 4, mKeyLabel, 4); place(0, 5, mPreviousButton, 1); place(1, 5, mCurrentLabel, 2); diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h index 6b7fbb163..cf2799d2b 100644 --- a/src/gui/windows/outfitwindow.h +++ b/src/gui/windows/outfitwindow.h @@ -106,7 +106,7 @@ class OutfitWindow final : public Window, Button *mPreviousButton A_NONNULLPOINTER; Button *mNextButton A_NONNULLPOINTER; - Button *mEquipButtom A_NONNULLPOINTER; + Button *mEquipBottom A_NONNULLPOINTER; Label *mCurrentLabel A_NONNULLPOINTER; CheckBox *mUnequipCheck A_NONNULLPOINTER; CheckBox *mAwayOutfitCheck A_NONNULLPOINTER; |