diff options
| author | Daniel Bradshaw <daniel+commits@the-cell.co.uk> | 2010-01-31 13:14:07 +0000 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-01-31 17:50:29 +0100 |
| commit | 2ff6ad2e8a67bd8ef34b56b866ef277c30135f19 (patch) | |
| tree | 536497f63044441a6e8032209446d1c3213b9d55 /src/net/ea | |
| parent | 22c75a346e029fad746b6aa0b123c886ddeb5c75 (diff) | |
| download | mana-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.tar.gz mana-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.tar.bz2 mana-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.tar.xz mana-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.zip | |
Unify eAthena and manaserv support in to one build.
Finish support for server types in the server dialog.
Using the new server type function, strip out ifdefs, replacing them with if
blocks for later merging in smaller atomic commits.
Remove any remaining references to the support defs, including in build system.
Diffstat (limited to 'src/net/ea')
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 10 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.h | 2 | ||||
| -rw-r--r-- | src/net/ea/tradehandler.cpp | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 0965e85a..156e8b26 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -47,9 +47,8 @@ #include "utils/stringutils.h" #include "utils/gettext.h" -// TODO Move somewhere else -OkDialog *weightNotice = NULL; -OkDialog *deathNotice = NULL; +extern OkDialog *weightNotice; +extern OkDialog *deathNotice; // Max. distance we are willing to scroll after a teleport; // everything beyond will reset the port hard. @@ -638,4 +637,9 @@ int PlayerHandler::getJobLocation() return JOB; } +float PlayerHandler::getDefaultWalkSpeed() +{ + return 150; +} + } // namespace EAthena diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index 61f3b705..83ca91f6 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -65,6 +65,8 @@ class PlayerHandler : public MessageHandler, public Net::PlayerHandler bool canCorrectAttributes(); int getJobLocation(); + + float getDefaultWalkSpeed(); }; } // namespace EAthena diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 56528a85..abcfc04f 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -40,7 +40,7 @@ #include "utils/gettext.h" #include "utils/stringutils.h" -std::string tradePartnerName; +extern std::string tradePartnerName; ConfirmDialog *confirmDlg; /** |