diff options
| author | Chuck Miller <shadowmil@gmail.com> | 2010-08-15 15:57:21 -0400 |
|---|---|---|
| committer | Chuck Miller <shadowmil@gmail.com> | 2010-08-15 15:57:21 -0400 |
| commit | 8f573b6c425dc82be42ad80eae565b0641a90a3b (patch) | |
| tree | 149c7889d384e10fd9dc95f1aa90478e69b314c8 /src/net/manaserv/playerhandler.cpp | |
| parent | fee9fbce12e620f25aecdc0690285cc47fa8791d (diff) | |
| parent | 2b676bbf6fcf7dfd45cb33f06dacd2ca5bce19fe (diff) | |
| download | mana-8f573b6c425dc82be42ad80eae565b0641a90a3b.tar.gz mana-8f573b6c425dc82be42ad80eae565b0641a90a3b.tar.bz2 mana-8f573b6c425dc82be42ad80eae565b0641a90a3b.tar.xz mana-8f573b6c425dc82be42ad80eae565b0641a90a3b.zip | |
Merge branch '1.0'
Conflicts:
mana.cbp
mana.files
src/CMakeLists.txt
src/Makefile.am
src/utils/xml.cpp
Diffstat (limited to 'src/net/manaserv/playerhandler.cpp')
| -rw-r--r-- | src/net/manaserv/playerhandler.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp index 4957bbbc..db2dcf7a 100644 --- a/src/net/manaserv/playerhandler.cpp +++ b/src/net/manaserv/playerhandler.cpp @@ -56,6 +56,10 @@ extern Net::PlayerHandler *playerHandler; namespace ManaServ { +extern Connection *gameServerConnection; +extern std::string netToken; +extern ServerInfo gameServer; + void RespawnRequestListener::action(const gcn::ActionEvent &event) { Net::getPlayerHandler()->respawn(); @@ -63,8 +67,6 @@ void RespawnRequestListener::action(const gcn::ActionEvent &event) Mana::Event::trigger("NPC", "CloseAll"); } -extern Connection *gameServerConnection; - PlayerHandler::PlayerHandler() { static const Uint16 _messages[] = { @@ -92,11 +94,18 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg) break; case GPMSG_PLAYER_SERVER_CHANGE: - { // TODO: Implement reconnecting to another game server - std::string token = msg.readString(32); + { // TODO: Fix the servers to test this + netToken = msg.readString(32); std::string address = msg.readString(); int port = msg.readInt16(); logger->log("Changing server to %s:%d", address.c_str(), port); + + gameServer.hostname = address; + gameServer.port = port; + + gameServerConnection->disconnect(); + Client::setState(STATE_CHANGE_MAP); + player_node->setMap(0); } break; case GPMSG_PLAYER_ATTRIBUTE_CHANGE: |