Merge branch 'master' into strippedstripped1.1.9.4

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/include/guichan/basiccontainer.hpp
	src/guichan/widgets/window.cpp

1 files changed, 18 insertions, 3 deletions

diff --git a/src/guild.cpp b/src/guild.cpp
index b84602858..98e5bb519 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -24,6 +24,8 @@
 
 #include "actorspritemanager.h"
 
+#include "utils/stringutils.h"
+
 #include "debug.h"
 
 class SortGuildFunctor
@@ -33,10 +35,22 @@ class SortGuildFunctor
         {
             if (!m1 || !m2)
                 return false;
+
+            if (m1->getOnline() != m2->getOnline())
+                return m1->getOnline() > m2->getOnline();
+
             if (m1->getPos() != m2->getPos())
-                return m1->getPos() < m2->getPos();
+                return m1->getPos() > m2->getPos();
 
-            return m1->getName() < m2->getName();
+            if (m1->getName() != m2->getName())
+            {
+                std::string s1 = m1->getName();
+                std::string s2 = m2->getName();
+                toLower(s1);
+                toLower(s2);
+                return s1 < s2;
+            }
+            return false;
         }
 } guildSorter;
 
@@ -66,7 +80,8 @@ Guild::GuildMap Guild::guilds;
 Guild::Guild(short id):
     mId(id),
     mCanInviteUsers(false),
-    mEmblemId(0)
+    mEmblemId(0),
+    mServerGuild(true)
 {
     guilds[id] = this;
 }