diff options
Diffstat (limited to 'src')
74 files changed, 103 insertions, 88 deletions
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index a68cfcdd9..653ce528a 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -38,7 +38,7 @@ bool AnimatedSprite::mEnableCache = false; -AnimatedSprite::AnimatedSprite(SpriteDef *const sprite): +AnimatedSprite::AnimatedSprite(SpriteDef *const sprite) : mDirection(SpriteDirection::DOWN), mLastTime(0), mFrameIndex(0), diff --git a/src/avatar.cpp b/src/avatar.cpp index d04c703a3..b5b66b8b2 100644 --- a/src/avatar.cpp +++ b/src/avatar.cpp @@ -24,7 +24,7 @@ #include "debug.h" -Avatar::Avatar(const std::string &name): +Avatar::Avatar(const std::string &name) : mId(0), mCharId(0), mName(name), diff --git a/src/being/actor.cpp b/src/being/actor.cpp index 7ced058d8..54252e80d 100644 --- a/src/being/actor.cpp +++ b/src/being/actor.cpp @@ -25,7 +25,7 @@ #include "debug.h" -Actor::Actor(): +Actor::Actor() : mMap(nullptr), mPos(), mYDiff(0), diff --git a/src/being/beingcacheentry.h b/src/being/beingcacheentry.h index c2c9aa513..9ffa2e7ef 100644 --- a/src/being/beingcacheentry.h +++ b/src/being/beingcacheentry.h @@ -28,7 +28,7 @@ class BeingCacheEntry final { public: - explicit BeingCacheEntry(const int id): + explicit BeingCacheEntry(const int id) : mName(), mPartyName(), mGuildName(), diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp index 416f73423..30f3ee4ac 100644 --- a/src/emoteshortcut.cpp +++ b/src/emoteshortcut.cpp @@ -31,7 +31,7 @@ EmoteShortcut *emoteShortcut = nullptr; -EmoteShortcut::EmoteShortcut(): +EmoteShortcut::EmoteShortcut() : mEmoteSelected(0) { for (int i = 0; i < SHORTCUT_EMOTES; i++) diff --git a/src/game.cpp b/src/game.cpp index c124fcfcf..ffd39aa2e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -390,7 +390,7 @@ static void destroyGuiWindows() Game *Game::mInstance = nullptr; -Game::Game(): +Game::Game() : mCurrentMap(nullptr), mMapName(""), mValidSpeed(true), diff --git a/src/gui/popups/spellpopup.cpp b/src/gui/popups/spellpopup.cpp index bf6ea1799..e8bfee72d 100644 --- a/src/gui/popups/spellpopup.cpp +++ b/src/gui/popups/spellpopup.cpp @@ -31,7 +31,7 @@ #include "debug.h" -SpellPopup::SpellPopup(): +SpellPopup::SpellPopup() : Popup("SpellPopup", "spellpopup.xml"), mItemName(new Label(this)), mItemComment(new Label(this)) diff --git a/src/gui/popups/textpopup.cpp b/src/gui/popups/textpopup.cpp index c16c188ef..5eff7fd4a 100644 --- a/src/gui/popups/textpopup.cpp +++ b/src/gui/popups/textpopup.cpp @@ -29,7 +29,7 @@ #include "debug.h" -TextPopup::TextPopup(): +TextPopup::TextPopup() : Popup("TextPopup", "textpopup.xml"), mText() { diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp index 5ef7ebd6b..626f1b53f 100644 --- a/src/gui/skin.cpp +++ b/src/gui/skin.cpp @@ -37,7 +37,7 @@ Skin::Skin(ImageRect *const restrict skin, const ImageRect *const restrict images, const std::string &filePath, const std::string &name, const int padding, const int titlePadding, - std::map<std::string, int> *restrict const options): + std::map<std::string, int> *restrict const options) : instances(1), mFilePath(filePath), mName(name), diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index 6322d120b..a1211477a 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -97,8 +97,8 @@ std::string UserPalette::getConfigName(const std::string &typeName) return res; } -UserPalette::UserPalette(): - Palette(USER_COLOR_LAST) +UserPalette::UserPalette() : + Palette(USER_COLOR_LAST) { mColors[BEING] = ColorElem(); mColors[PC] = ColorElem(); diff --git a/src/gui/widgets/chatinput.h b/src/gui/widgets/chatinput.h index 5ac95a928..57373657e 100644 --- a/src/gui/widgets/chatinput.h +++ b/src/gui/widgets/chatinput.h @@ -39,7 +39,7 @@ class ChatInput final : public TextField { public: - explicit ChatInput(ChatWindow *const window): + explicit ChatInput(ChatWindow *const window) : TextField(window, "", false), mWindow(window), mFocusGaining(false) diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index dec4e88c6..86e79b504 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -61,7 +61,7 @@ DropDown::DropDown(const Widget2 *const widget, const bool extended, const bool modal, ActionListener *const listener, - const std::string &eventId): + const std::string &eventId) : ActionListener(), BasicContainer(widget), KeyListener(), diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index b9ba2fdae..6e4e0d90c 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -42,7 +42,7 @@ #include "debug.h" -DropShortcutContainer::DropShortcutContainer(Widget2 *const widget): +DropShortcutContainer::DropShortcutContainer(Widget2 *const widget) : ShortcutContainer(widget), mItemClicked(false), mItemPopup(new ItemPopup), diff --git a/src/gui/widgets/layoutarray.cpp b/src/gui/widgets/layoutarray.cpp index 57a8f5f26..c623c793d 100644 --- a/src/gui/widgets/layoutarray.cpp +++ b/src/gui/widgets/layoutarray.cpp @@ -32,7 +32,7 @@ #include "debug.h" -LayoutArray::LayoutArray(): +LayoutArray::LayoutArray() : mCells(), mSpacing(4) { diff --git a/src/gui/widgets/layoutcell.h b/src/gui/widgets/layoutcell.h index 25783558c..7761e021c 100644 --- a/src/gui/widgets/layoutcell.h +++ b/src/gui/widgets/layoutcell.h @@ -143,7 +143,7 @@ class LayoutCell }; private: - LayoutCell(): + LayoutCell() : mWidget(nullptr), mHPadding(0), mVPadding(0), diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp index 27f0bc188..b85eff686 100644 --- a/src/gui/widgets/passwordfield.cpp +++ b/src/gui/widgets/passwordfield.cpp @@ -27,7 +27,7 @@ #include "debug.h" PasswordField::PasswordField(const Widget2 *const widget, - const std::string &text): + const std::string &text) : TextField(widget, text), mPasswordChar(mSkin ? mSkin->getOption("passwordChar", 42) : 42) { diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp index c203f59c6..e4a7dcf47 100644 --- a/src/gui/widgets/popuplist.cpp +++ b/src/gui/widgets/popuplist.cpp @@ -30,7 +30,7 @@ PopupList::PopupList(DropDown *const widget, ListModel *const listModel, - bool extended, bool modal): + bool extended, bool modal) : Popup("PopupList", "popuplist.xml"), FocusListener(), mListModel(listModel), diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 6823ca050..b9675af7f 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -43,7 +43,7 @@ ProgressBar::ProgressBar(const Widget2 *const widget, const int height, const int backColor, const std::string &skin, - const std::string &skinFill): + const std::string &skinFill) : Widget(widget), WidgetListener(), mFillRect(), diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index d2d12f1c6..9074a8a0c 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -88,7 +88,7 @@ RadioButton::GroupMap RadioButton::mGroupMap; RadioButton::RadioButton(const Widget2 *const widget, const std::string &restrict caption, const std::string &restrict group, - const bool marked): + const bool marked) : Widget(widget), MouseListener(), KeyListener(), diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h index 1514c56e5..31fb5d938 100644 --- a/src/gui/widgets/tabs/socialtab.h +++ b/src/gui/widgets/tabs/socialtab.h @@ -73,7 +73,7 @@ class SocialTab : public Tab protected: friend class SocialWindow; - explicit SocialTab(const Widget2 *const widget): + explicit SocialTab(const Widget2 *const widget) : Tab(widget), mInviteDialog(nullptr), mConfirmDialog(nullptr), diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 72ff8ea87..dc8b107c4 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -98,7 +98,7 @@ TextField::TextField(const Widget2 *restrict const widget, const bool loseFocusOnTab, ActionListener *restrict const listener, const std::string &restrict eventId, - const bool sendAlwaysEvents): + const bool sendAlwaysEvents) : Widget(widget), FocusListener(), KeyListener(), diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp index 8e4bdd047..292d18891 100644 --- a/src/gui/windows/botcheckerwindow.cpp +++ b/src/gui/windows/botcheckerwindow.cpp @@ -36,7 +36,7 @@ #include "debug.h" -BotCheckerWindow::BotCheckerWindow(): +BotCheckerWindow::BotCheckerWindow() : // TRANSLATORS: bot checker window header Window(_("Bot Checker"), false, nullptr, "botchecker.xml"), ActionListener(), diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp index 33a55ef2b..f67a01584 100644 --- a/src/gui/windows/changeemaildialog.cpp +++ b/src/gui/windows/changeemaildialog.cpp @@ -44,7 +44,7 @@ #include "debug.h" -ChangeEmailDialog::ChangeEmailDialog(LoginData *const data): +ChangeEmailDialog::ChangeEmailDialog(LoginData *const data) : // TRANSLATORS: change email dialog header Window(_("Change Email Address"), true, nullptr, "changeemail.xml"), ActionListener(), diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp index d809c5efc..c2bb85c21 100644 --- a/src/gui/windows/changepassworddialog.cpp +++ b/src/gui/windows/changepassworddialog.cpp @@ -45,7 +45,7 @@ #include "debug.h" -ChangePasswordDialog::ChangePasswordDialog(LoginData *const data): +ChangePasswordDialog::ChangePasswordDialog(LoginData *const data) : // TRANSLATORS: change password window name Window(_("Change Password"), true, nullptr, "changepassword.xml"), ActionListener(), diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 167bd37f1..70d8cc4e1 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -55,7 +55,7 @@ // Character slots per row in the dialog static const int SLOTS_PER_ROW = 5; -CharSelectDialog::CharSelectDialog(LoginData *const data): +CharSelectDialog::CharSelectDialog(LoginData *const data) : // TRANSLATORS: char select dialog name Window(strprintf(_("Account %s (last login time %s)"), data->username.c_str(), data->lastLogin.c_str()), diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index fe95b4e97..0ec192a89 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -85,7 +85,7 @@ static const char *const ACTION_COLOR_PICKER = "color picker"; -ChatWindow::ChatWindow(): +ChatWindow::ChatWindow() : // TRANSLATORS: chat window name Window(_("Chat"), false, nullptr, "chat.xml"), ActionListener(), diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp index f71d4e551..ee4844aa5 100644 --- a/src/gui/windows/confirmdialog.cpp +++ b/src/gui/windows/confirmdialog.cpp @@ -37,7 +37,7 @@ ConfirmDialog::ConfirmDialog(const std::string &restrict title, const std::string &restrict msg, const std::string &restrict soundEvent, const bool ignore, - const bool modal, Window *const parent): + const bool modal, Window *const parent) : Window(title, modal, parent, "confirm.xml"), ActionListener(), mTextBox(new TextBox(this)), diff --git a/src/gui/windows/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp index 93b7f7e7b..3ea6d797a 100644 --- a/src/gui/windows/connectiondialog.cpp +++ b/src/gui/windows/connectiondialog.cpp @@ -36,7 +36,7 @@ extern bool mStatsReUpdated; ConnectionDialog::ConnectionDialog(const std::string &text, - const State cancelState): + const State cancelState) : Window("", false, nullptr, "connection.xml"), ActionListener(), mCancelState(cancelState) diff --git a/src/gui/windows/editdialog.cpp b/src/gui/windows/editdialog.cpp index 55102acdb..e0fbbdc4e 100644 --- a/src/gui/windows/editdialog.cpp +++ b/src/gui/windows/editdialog.cpp @@ -30,8 +30,10 @@ EditDialog::EditDialog(const std::string &restrict title, const std::string &restrict msg, - const std::string &restrict eventOk, const int width, - Window *const parent, const bool modal): + const std::string &restrict eventOk, + const int width, + Window *const parent, + const bool modal) : Window(title, modal, parent, "edit.xml"), ActionListener(), mEventOk(eventOk), diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 4d90899b5..3cd1cd92e 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -57,7 +57,7 @@ static const int BOX_COUNT = 13; EquipmentWindow::EquipmentWindow(Equipment *const equipment, Being *const being, - const bool foring): + const bool foring) : // TRANSLATORS: equipment window name Window(_("Equipment"), false, nullptr, "equipment.xml"), ActionListener(), diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 2049d2a12..43e5112a0 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -70,7 +70,7 @@ InventoryWindow::WindowList InventoryWindow::invInstances; -InventoryWindow::InventoryWindow(Inventory *const inventory): +InventoryWindow::InventoryWindow(Inventory *const inventory) : Window("Inventory", false, nullptr, "inventory.xml"), ActionListener(), KeyListener(), diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index 6cd9ecdf5..94059592b 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -60,8 +60,9 @@ namespace OpenUrlListener urlListener; } // namespace -LoginDialog::LoginDialog(LoginData *const data, std::string serverName, - std::string *const updateHost): +LoginDialog::LoginDialog(LoginData *const data, + std::string serverName, + std::string *const updateHost) : // TRANSLATORS: login dialog name Window(_("Login"), false, nullptr, "login.xml"), ActionListener(), diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp index 3fdb42cb7..327fcbf3f 100644 --- a/src/gui/windows/npcpostdialog.cpp +++ b/src/gui/windows/npcpostdialog.cpp @@ -39,7 +39,7 @@ NpcPostDialog::DialogList NpcPostDialog::instances; -NpcPostDialog::NpcPostDialog(const int npcId): +NpcPostDialog::NpcPostDialog(const int npcId) : // TRANSLATORS: npc post dialog caption Window(_("NPC"), false, nullptr, "npcpost.xml"), ActionListener(), diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index f9ac83ada..60030fbd3 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -49,7 +49,7 @@ #include "debug.h" -OutfitWindow::OutfitWindow(): +OutfitWindow::OutfitWindow() : // TRANSLATORS: outfits window name Window(_("Outfits"), false, nullptr, "outfits.xml"), ActionListener(), diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index 9d0b72295..20c194360 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -50,7 +50,7 @@ #include "debug.h" -QuitDialog::QuitDialog(QuitDialog **const pointerToMe): +QuitDialog::QuitDialog(QuitDialog **const pointerToMe) : // TRANSLATORS: quit dialog name Window(_("Quit"), true, nullptr, "quit.xml"), ActionListener(), diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp index 691624e06..18d993c91 100644 --- a/src/gui/windows/selldialog.cpp +++ b/src/gui/windows/selldialog.cpp @@ -68,7 +68,7 @@ SellDialog::SellDialog(const int npcId) : init(); } -SellDialog::SellDialog(const std::string &nick): +SellDialog::SellDialog(const std::string &nick) : // TRANSLATORS: sell dialog name Window(_("Sell"), false, nullptr, "sell.xml"), ActionListener(), diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 903a21a57..2d13cf23f 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -74,7 +74,7 @@ extern std::string tradePartnerName; ShopWindow::DialogList ShopWindow::instances; -ShopWindow::ShopWindow(): +ShopWindow::ShopWindow() : // TRANSLATORS: shop window name Window(_("Personal Shop"), false, nullptr, "shop.xml"), ActionListener(), diff --git a/src/gui/windows/textdialog.cpp b/src/gui/windows/textdialog.cpp index 3aa3211ad..314f8d6a0 100644 --- a/src/gui/windows/textdialog.cpp +++ b/src/gui/windows/textdialog.cpp @@ -39,7 +39,7 @@ int TextDialog::instances = 0; TextDialog::TextDialog(const std::string &restrict title, const std::string &restrict msg, Window *const parent, - const bool isPassword): + const bool isPassword) : Window(title, true, parent, "textdialog.xml"), ActionListener(), mTextField(nullptr), diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 5827ca8a0..eaef2026b 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -67,7 +67,7 @@ // TRANSLATORS: trade window button #define CAPTION_ACCEPTED _("Agreed. Waiting...") -TradeWindow::TradeWindow(): +TradeWindow::TradeWindow() : // TRANSLATORS: trade window caption Window(_("Trade: You"), false, nullptr, "trade.xml"), ActionListener(), diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 9835279cc..b38f19943 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -162,7 +162,7 @@ static std::vector<UpdateFile> loadTxtFile(const std::string &fileName) UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost, const std::string &restrict updatesDir, const bool applyUpdates, - const int updateType): + const int updateType) : // TRANSLATORS: updater window name Window(_("Updating..."), false, nullptr, "update.xml"), ActionListener(), diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp index 6a3dfb7a1..da7e29585 100644 --- a/src/gui/windows/worldselectdialog.cpp +++ b/src/gui/windows/worldselectdialog.cpp @@ -43,7 +43,7 @@ extern WorldInfo **server_info; -WorldSelectDialog::WorldSelectDialog(Worlds worlds): +WorldSelectDialog::WorldSelectDialog(Worlds worlds) : // TRANSLATORS: world select dialog name Window(_("Select World"), false, nullptr, "world.xml"), ActionListener(), diff --git a/src/guild.cpp b/src/guild.cpp index a589430e2..a6e5c5ad7 100644 --- a/src/guild.cpp +++ b/src/guild.cpp @@ -61,15 +61,19 @@ namespace } // namespace GuildMember::GuildMember(Guild *const guild, const int accountId, - const int charId, const std::string &name): - Avatar(name), mGuild(guild), mPos(0) + const int charId, const std::string &name) : + Avatar(name), + mGuild(guild), + mPos(0) { mId = accountId; mCharId = charId; } -GuildMember::GuildMember(Guild *const guild, const std::string &name): - Avatar(name), mGuild(guild), mPos(0) +GuildMember::GuildMember(Guild *const guild, const std::string &name) : + Avatar(name), + mGuild(guild), + mPos(0) { } @@ -83,7 +87,7 @@ std::string GuildMember::getAdditionString() const Guild::GuildMap Guild::guilds; -Guild::Guild(const int16_t id): +Guild::Guild(const int16_t id) : mMembers(), mName(), mId(id), diff --git a/src/imagesprite.cpp b/src/imagesprite.cpp index 965c333bf..cb2c03084 100644 --- a/src/imagesprite.cpp +++ b/src/imagesprite.cpp @@ -25,8 +25,8 @@ #include "debug.h" -ImageSprite::ImageSprite(Image *const image): - mImage(image) +ImageSprite::ImageSprite(Image *const image) : + mImage(image) { if (mImage) { diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp index 2368876cc..f3dd2e90c 100644 --- a/src/input/joystick.cpp +++ b/src/input/joystick.cpp @@ -37,7 +37,7 @@ int Joystick::joystickCount = 0; bool Joystick::mEnabled = false; -Joystick::Joystick(const int no): +Joystick::Joystick(const int no) : mDirection(0), mJoystick(nullptr), mUpTolerance(0), diff --git a/src/item.cpp b/src/item.cpp index 49a6bd7a6..90ff716bb 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -39,7 +39,7 @@ DragDrop dragDrop(nullptr, DRAGDROP_SOURCE_EMPTY); Item::Item(const int id, const int quantity, const int refine, const unsigned char color, const bool equipment, - const bool equipped): + const bool equipped) : mId(0), mColor(0), mQuantity(quantity), diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index d4c7efa3a..eacdec03d 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -38,7 +38,7 @@ ItemShortcut *itemShortcut[SHORTCUT_TABS]; -ItemShortcut::ItemShortcut(const int number): +ItemShortcut::ItemShortcut(const int number) : mItemSelected(-1), mItemColorSelected(1), mNumber(number) diff --git a/src/listeners/guiconfiglistener.h b/src/listeners/guiconfiglistener.h index e333de99c..2e6c50025 100644 --- a/src/listeners/guiconfiglistener.h +++ b/src/listeners/guiconfiglistener.h @@ -34,7 +34,7 @@ class GuiConfigListener final : public ConfigListener { public: - explicit GuiConfigListener(Gui *const g): + explicit GuiConfigListener(Gui *const g) : mGui(g) {} diff --git a/src/listeners/wrongdatanoticelistener.cpp b/src/listeners/wrongdatanoticelistener.cpp index 11b209ab2..370501db3 100644 --- a/src/listeners/wrongdatanoticelistener.cpp +++ b/src/listeners/wrongdatanoticelistener.cpp @@ -26,7 +26,7 @@ #include "debug.h" -WrongDataNoticeListener::WrongDataNoticeListener(): +WrongDataNoticeListener::WrongDataNoticeListener() : ActionListener(), mTarget(nullptr) { diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index e32ced211..38f495454 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -55,7 +55,7 @@ extern int serverVersion; namespace EAthena { -BeingHandler::BeingHandler(const bool enableSync): +BeingHandler::BeingHandler(const bool enableSync) : MessageHandler(), Ea::BeingHandler(enableSync) { diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp index f797c6a95..49b67b84e 100644 --- a/src/net/eathena/messageout.cpp +++ b/src/net/eathena/messageout.cpp @@ -38,7 +38,7 @@ namespace EAthena { -MessageOut::MessageOut(const int16_t id): +MessageOut::MessageOut(const int16_t id) : Net::MessageOut(id), mNetwork(EAthena::Network::instance()) { diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 538ce6110..cbdcd127c 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -37,7 +37,7 @@ namespace Net { -MessageIn::MessageIn(const char *const data, const unsigned int length): +MessageIn::MessageIn(const char *const data, const unsigned int length) : mData(data), mLength(length), mId(0), diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index 1b78e2aee..16b205373 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -36,7 +36,7 @@ namespace Net { -MessageOut::MessageOut(const int16_t id A_UNUSED): +MessageOut::MessageOut(const int16_t id A_UNUSED) : mData(nullptr), mDataSize(0), mPos(0) diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp index b32dcb3e5..1a3986412 100644 --- a/src/net/tmwa/messageout.cpp +++ b/src/net/tmwa/messageout.cpp @@ -38,7 +38,7 @@ namespace TmwAthena { -MessageOut::MessageOut(const int16_t id): +MessageOut::MessageOut(const int16_t id) : Net::MessageOut(id), mNetwork(TmwAthena::Network::instance()) { diff --git a/src/particle/animationparticle.cpp b/src/particle/animationparticle.cpp index dccd3d037..ec159e8a4 100644 --- a/src/particle/animationparticle.cpp +++ b/src/particle/animationparticle.cpp @@ -35,7 +35,7 @@ AnimationParticle::AnimationParticle(Animation *const animation) : } AnimationParticle::AnimationParticle(XmlNodePtrConst animationNode, - const std::string& dyePalettes): + const std::string& dyePalettes) : ImageParticle(nullptr), mAnimation(new SimpleAnimation(animationNode, dyePalettes)) { diff --git a/src/particle/imageparticle.cpp b/src/particle/imageparticle.cpp index 92f458e41..c637c1859 100644 --- a/src/particle/imageparticle.cpp +++ b/src/particle/imageparticle.cpp @@ -30,7 +30,7 @@ std::map<std::string, int> ImageParticle::imageParticleCountByName; -ImageParticle::ImageParticle(Image *const image): +ImageParticle::ImageParticle(Image *const image) : Particle(), mImage(image) { diff --git a/src/particle/particlecontainer.cpp b/src/particle/particlecontainer.cpp index a2b0f29a9..798676c59 100644 --- a/src/particle/particlecontainer.cpp +++ b/src/particle/particlecontainer.cpp @@ -27,7 +27,7 @@ #include "debug.h" ParticleContainer::ParticleContainer(ParticleContainer *const parent, - const bool delParent): + const bool delParent) : mNext(parent), mDelParent(delParent) { diff --git a/src/particle/particleemitterprop.h b/src/particle/particleemitterprop.h index 21f4ff8fa..ef3a6d313 100644 --- a/src/particle/particleemitterprop.h +++ b/src/particle/particleemitterprop.h @@ -44,7 +44,7 @@ enum ChangeFunc template <typename T> struct ParticleEmitterProp final { - ParticleEmitterProp(): + ParticleEmitterProp() : minVal(0), maxVal(0), changeFunc(FUNC_NONE), changeAmplitude(0), changePeriod(0), changePhase(0) { diff --git a/src/particle/rotationalparticle.cpp b/src/particle/rotationalparticle.cpp index 976234f83..aab0a4610 100644 --- a/src/particle/rotationalparticle.cpp +++ b/src/particle/rotationalparticle.cpp @@ -40,7 +40,7 @@ RotationalParticle::RotationalParticle(Animation *const animation) : } RotationalParticle::RotationalParticle(const XmlNodePtr animationNode, - const std::string& dyePalettes): + const std::string& dyePalettes) : ImageParticle(nullptr), mAnimation(new SimpleAnimation(animationNode, dyePalettes)) { diff --git a/src/party.cpp b/src/party.cpp index 5e07175d7..9938d3483 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -59,7 +59,9 @@ namespace PartyMember::PartyMember(Party *const party, const int id, const std::string &name) : - Avatar(name), mParty(party), mLeader(false) + Avatar(name), + mParty(party), + mLeader(false) { mId = id; } diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index 34e5c334c..bd8c38d5e 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -73,7 +73,7 @@ unsigned int MobileOpenGLGraphics::mDrawCalls = 0; unsigned int MobileOpenGLGraphics::mLastDrawCalls = 0; #endif -MobileOpenGLGraphics::MobileOpenGLGraphics(): +MobileOpenGLGraphics::MobileOpenGLGraphics() : mFloatTexArray(nullptr), mShortVertArray(nullptr), mFloatTexArrayCached(nullptr), diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index c7b01c4d2..54d773cc4 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -87,7 +87,7 @@ unsigned int NormalOpenGLGraphics::mBinds = 0; unsigned int NormalOpenGLGraphics::mLastBinds = 0; #endif -NormalOpenGLGraphics::NormalOpenGLGraphics(): +NormalOpenGLGraphics::NormalOpenGLGraphics() : mFloatTexArray(nullptr), mIntTexArray(nullptr), mIntVertArray(nullptr), diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp index 4498ed9c6..08d0ddaf2 100644 --- a/src/render/nullopenglgraphics.cpp +++ b/src/render/nullopenglgraphics.cpp @@ -44,7 +44,7 @@ unsigned int NullOpenGLGraphics::mDrawCalls = 0; unsigned int NullOpenGLGraphics::mLastDrawCalls = 0; #endif -NullOpenGLGraphics::NullOpenGLGraphics(): +NullOpenGLGraphics::NullOpenGLGraphics() : mFloatTexArray(nullptr), mIntTexArray(nullptr), mIntVertArray(nullptr), diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp index bc22b3c69..2fdc55e87 100644 --- a/src/render/safeopenglgraphics.cpp +++ b/src/render/safeopenglgraphics.cpp @@ -40,7 +40,7 @@ GLuint SafeOpenGLGraphics::mLastImage = 0; -SafeOpenGLGraphics::SafeOpenGLGraphics(): +SafeOpenGLGraphics::SafeOpenGLGraphics() : mTexture(false), mIsByteColor(false), mByteColor(), diff --git a/src/resources/db/colordb.h b/src/resources/db/colordb.h index d1fc1a420..102e4df4b 100644 --- a/src/resources/db/colordb.h +++ b/src/resources/db/colordb.h @@ -35,7 +35,7 @@ namespace ColorDB class ItemColor final { public: - ItemColor(): + ItemColor() : id(0), name(), color() diff --git a/src/resources/map/location.h b/src/resources/map/location.h index 7c1995dba..f2c9af323 100644 --- a/src/resources/map/location.h +++ b/src/resources/map/location.h @@ -35,7 +35,7 @@ struct Location final /** * Constructor. */ - Location(const int px, const int py, MetaTile *const ptile): + Location(const int px, const int py, MetaTile *const ptile) : x(px), y(py), tile(ptile) {} diff --git a/src/resources/map/mapitem.cpp b/src/resources/map/mapitem.cpp index e035d88b3..bb3b0766c 100644 --- a/src/resources/map/mapitem.cpp +++ b/src/resources/map/mapitem.cpp @@ -33,7 +33,7 @@ #include "debug.h" -MapItem::MapItem(): +MapItem::MapItem() : mImage(nullptr), mComment(), mName(), @@ -44,7 +44,7 @@ MapItem::MapItem(): setType(MapItemType::EMPTY); } -MapItem::MapItem(const int type): +MapItem::MapItem(const int type) : mImage(nullptr), mComment(), mName(), @@ -55,7 +55,7 @@ MapItem::MapItem(const int type): setType(type); } -MapItem::MapItem(const int type, std::string comment): +MapItem::MapItem(const int type, std::string comment) : mImage(nullptr), mComment(comment), mName(), @@ -67,7 +67,7 @@ MapItem::MapItem(const int type, std::string comment): } MapItem::MapItem(const int type, std::string comment, - const int x, const int y): + const int x, const int y) : mImage(nullptr), mComment(comment), mName(), diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp index a5f2f056d..51e076e81 100644 --- a/src/resources/map/maplayer.cpp +++ b/src/resources/map/maplayer.cpp @@ -45,8 +45,10 @@ #include "debug.h" -MapLayer::MapLayer(const int x, const int y, const int width, const int height, - const bool fringeLayer, const int mask): +MapLayer::MapLayer(const int x, const int y, + const int width, const int height, + const bool fringeLayer, + const int mask) : mX(x), mY(y), mWidth(width), diff --git a/src/resources/map/tileanimation.cpp b/src/resources/map/tileanimation.cpp index 6dfe6f0be..8378a0f4e 100644 --- a/src/resources/map/tileanimation.cpp +++ b/src/resources/map/tileanimation.cpp @@ -30,7 +30,7 @@ #include "debug.h" -TileAnimation::TileAnimation(Animation *const ani): +TileAnimation::TileAnimation(Animation *const ani) : mAffected(), mAnimation(new SimpleAnimation(ani)), mLastImage(nullptr) diff --git a/src/resources/map/tileset.h b/src/resources/map/tileset.h index 312896c62..fa1291ba2 100644 --- a/src/resources/map/tileset.h +++ b/src/resources/map/tileset.h @@ -36,8 +36,12 @@ class Tileset final : public ImageSet /** * Constructor. */ - Tileset(Image *const img, const int w, const int h, const int firstGid, - const int margin, const int spacing): + Tileset(Image *const img, + const int w, + const int h, + const int firstGid, + const int margin, + const int spacing) : ImageSet(img, w, h, margin, spacing), mFirstGid(firstGid), mProperties() diff --git a/src/resources/spritereference.h b/src/resources/spritereference.h index 4e3c16e1f..681bb0153 100644 --- a/src/resources/spritereference.h +++ b/src/resources/spritereference.h @@ -31,7 +31,7 @@ struct SpriteReference final { static SpriteReference *Empty; - SpriteReference(): + SpriteReference() : sprite(), variant(0) {} diff --git a/src/resources/subimage.cpp b/src/resources/subimage.cpp index fd35fb7bb..717858ae0 100644 --- a/src/resources/subimage.cpp +++ b/src/resources/subimage.cpp @@ -136,7 +136,7 @@ SubImage::SubImage(Image *const parent, SDL_Surface *const image, #ifdef USE_OPENGL SubImage::SubImage(Image *const parent, const GLuint image, const int x, const int y, const int width, const int height, - const int texWidth, const int texHeight): + const int texWidth, const int texHeight) : Image(image, width, height, texWidth, texHeight), mInternalBounds(), mParent(parent) diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp index 46101ae52..915483d99 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -48,7 +48,7 @@ SimpleAnimation::SimpleAnimation(Animation *const animation) : } SimpleAnimation::SimpleAnimation(const XmlNodePtr animationNode, - const std::string& dyePalettes): + const std::string& dyePalettes) : mAnimation(new Animation), mAnimationTime(0), mAnimationPhase(0), diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index e9fd3fea0..f708202c6 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -49,7 +49,7 @@ static void fadeOutCallBack() sFadingOutEnded = true; } -SoundManager::SoundManager(): +SoundManager::SoundManager() : mNextMusicFile(), mInstalled(false), mSfxVolume(100), diff --git a/src/vector.h b/src/vector.h index 2ec3bc724..151b933c0 100644 --- a/src/vector.h +++ b/src/vector.h @@ -39,7 +39,7 @@ class Vector final /** * Constructor. */ - Vector(): + Vector() : x(0.0F), y(0.0F), z(0.0F) @@ -57,7 +57,7 @@ class Vector final /** * Copy constructor. */ - Vector(const Vector &v): + Vector(const Vector &v) : x(v.x), y(v.y), z(v.z) |