Added support for the "persistentIp" server info setting

This option was added in ManaPlus and support for it is required to
connect to The Mana World as it is currently set up, since the server
sends 127.0.0.1 for the character server and map server IP.

Can't play yet, because of an unknown packet 0x226 being received once
connecting to the map server.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 7c5f5c88..a8e87622 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -158,7 +158,14 @@ void CharServerHandler::handleMessage(MessageIn &msg)
             msg.skip(4); // CharID, must be the same as local_player->charID
             GameHandler *gh = static_cast<GameHandler*>(Net::getGameHandler());
             gh->setMap(msg.readString(16));
-            mapServer.hostname = ipToString(msg.readInt32());
+
+            const auto ip = msg.readInt32();
+
+            if (charServer.persistentIp)
+                mapServer.hostname = charServer.hostname;
+            else
+                mapServer.hostname = ipToString(ip);
+
             mapServer.port = msg.readInt16();
 
             local_player = mSelectedCharacter->dummy;