This commit contains three things: one, after looking over how TMW was

handling the effects through the level up system, I determined that it 
wasn't bad, so I pulled it from TMW's SVN. Two, I edited the web page 
css so that it better matches the forum. And three, I patched text 
wrapping so that it'll fix up its display size based on all previous 
lines, except for the last line. That fix will come later, but for now, 
it'll be seen as a special case. While you'd like to think that just 
resending the string and starting the function over again would fix it, 
you'd be wrong. So it won't be patched until I think of a better way to 
handle that case.

1 files changed, 9 insertions, 5 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 4427b4d4..f9061c42 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -163,6 +163,8 @@ struct Options
  */
 void setUpdatesDir()
 {
+    std::stringstream updates;
+
     // If updatesHost is currently empty, fill it from config file
     if (updateHost.empty()) {
         updateHost =
@@ -174,8 +176,9 @@ void setUpdatesDir()
     pos = updateHost.find("://");
     if (pos != updateHost.npos) {
         if (pos + 3 < updateHost.length()) {
-            updatesDir =
-                "updates/" + updateHost.substr(pos + 3);
+            updates << "updates/" << updateHost.substr(pos + 3) 
+                    << "-" << loginData.port;
+            updatesDir = updates.str();
         } else {
             logger->log("Error: Invalid update host: %s", updateHost.c_str());
             errorMessage = "Invalid update host: " + updateHost;
@@ -183,7 +186,8 @@ void setUpdatesDir()
         }
     } else {
         logger->log("Warning: no protocol was specified for the update host");
-        updatesDir = "updates/" + updateHost;
+        updates << "updates/" << updateHost  << "-" << loginData.port;
+        updatesDir = updates.str();
     }
 
     ResourceManager *resman = ResourceManager::getInstance();
@@ -708,8 +712,8 @@ int main(int argc, char *argv[])
     if (!options.password.empty()) {
         loginData.password = options.password;
     }
-    loginData.hostname = config.getValue("host", "216.139.126.36");
-    loginData.port = (short)config.getValue("port", 0);
+    loginData.hostname = config.getValue("host", "www.aethyra.org");
+    loginData.port = (short)config.getValue("port", 21001);
     loginData.remember = config.getValue("remember", 0);
     loginData.registerLogin = false;