diff options
-rw-r--r-- | src/gui/registerdialog.cpp | 2 | ||||
-rw-r--r-- | src/localplayer.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/partyhandler.h | 2 | ||||
-rw-r--r-- | src/net/eathena/playerhandler.h | 4 | ||||
-rw-r--r-- | src/net/partyhandler.h | 2 | ||||
-rw-r--r-- | src/net/playerhandler.h | 4 | ||||
-rw-r--r-- | src/net/tmwa/partyhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/playerhandler.h | 4 | ||||
-rw-r--r-- | src/resources/soundeffect.h | 4 |
9 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/registerdialog.cpp b/src/gui/registerdialog.cpp index 27f56d3d5..bb76bc8b2 100644 --- a/src/gui/registerdialog.cpp +++ b/src/gui/registerdialog.cpp @@ -126,7 +126,7 @@ RegisterDialog::RegisterDialog(LoginData *const data): placer(0, row, emailLabel); placer(1, row, mEmailField, 3).setPadding(2); - row++; +// row++; } placer = getPlacer(0, 2); diff --git a/src/localplayer.cpp b/src/localplayer.cpp index c38d66c18..7cc69ec9f 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -1163,7 +1163,7 @@ void LocalPlayer::stopWalking(const bool sendToServer) { Net::getPlayerHandler()->setDestination( static_cast<int>(getPosition().x), - static_cast<int>(getPosition().y)); + static_cast<int>(getPosition().y), -1); } setAction(STAND); } diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h index 4b18344e8..bf58b58aa 100644 --- a/src/net/eathena/partyhandler.h +++ b/src/net/eathena/partyhandler.h @@ -43,7 +43,7 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler void handleMessage(Net::MessageIn &msg); - void create(const std::string &name = ""); + void create(const std::string &name); void invite(Being *being); diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h index bdc77c59b..87bd2a7c6 100644 --- a/src/net/eathena/playerhandler.h +++ b/src/net/eathena/playerhandler.h @@ -42,7 +42,7 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler void handleMessage(Net::MessageIn &msg); - void attack(int id, bool keep = false); + void attack(int id, bool keep); void stopAttack(); void emote(uint8_t emoteId); @@ -51,7 +51,7 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler void pickUp(const FloorItem *floorItem); void setDirection(unsigned char direction); - void setDestination(int x, int y, int direction = -1); + void setDestination(int x, int y, int direction); void changeAction(Being::Action action); void updateStatus(uint8_t status); diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index cd75e51fe..553f73e83 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -48,7 +48,7 @@ class PartyHandler virtual ~PartyHandler() { } - virtual void create(const std::string &name = "") = 0; + virtual void create(const std::string &name) = 0; virtual void join(int partyId) = 0; diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 01ab732e3..d0a9fb512 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -36,7 +36,7 @@ class PlayerHandler virtual ~PlayerHandler() { } - virtual void attack(int id, bool keep = false) = 0; + virtual void attack(int id, bool keep) = 0; virtual void stopAttack() = 0; @@ -52,7 +52,7 @@ class PlayerHandler virtual void setDirection(unsigned char direction) = 0; - virtual void setDestination(int x, int y, int direction = -1) = 0; + virtual void setDestination(int x, int y, int direction) = 0; virtual void changeAction(Being::Action action) = 0; diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h index 27f4993a8..352e57d7d 100644 --- a/src/net/tmwa/partyhandler.h +++ b/src/net/tmwa/partyhandler.h @@ -43,7 +43,7 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler void handleMessage(Net::MessageIn &msg); - void create(const std::string &name = ""); + void create(const std::string &name); void invite(Being *being); diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index bc54834f1..8aab78738 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -42,7 +42,7 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler void handleMessage(Net::MessageIn &msg); - void attack(int id, bool keep = false); + void attack(int id, bool keep); void stopAttack(); void emote(uint8_t emoteId); @@ -51,7 +51,7 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler void pickUp(const FloorItem *floorItem); void setDirection(unsigned char direction); - void setDestination(int x, int y, int direction = -1); + void setDestination(int x, int y, int direction); void changeAction(Being::Action action); void processOnlineList(Net::MessageIn &msg); void requestOnlineList(); diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 20164a397..c375fa0f8 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -62,8 +62,8 @@ class SoundEffect final : public Resource * @return <code>true</code> if the playback started properly * <code>false</code> otherwise. */ - virtual bool play(const int loops, const int volume, - const int channel = -1) const; + bool play(const int loops, const int volume, + const int channel = -1) const; protected: /** |