3 files changed, 5 insertions, 50 deletions

diff --git a/src/game-server/character.hpp b/src/game-server/character.hpp
index b90d2b3c..05834f7d 100644
--- a/src/game-server/character.hpp
+++ b/src/game-server/character.hpp
@@ -275,8 +275,8 @@ class Character : public Being
         Character(Character const &);
         Character &operator=(Character const &);
 
-        static const float EXPCURVE_EXPONENT = 3.0f; // should maybe be obtained
-        static const float EXPCURVE_FACTOR = 10.0f;  // from the config file
+        static const float EXPCURVE_EXPONENT = 5.0f; // should maybe be obtained
+        static const float EXPCURVE_FACTOR = 3.0f;  // from the config file
         static const float LEVEL_SKILL_PRECEDENCE_FACTOR = 0.75f; // I am taking suggestions for a better name
         static const int CHARPOINTS_PER_LEVELUP = 5;
         static const int CORRECTIONPOINTS_PER_LEVELUP = 2;
diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp
index 249745f4..f9fcf5ec 100644
--- a/src/game-server/gamehandler.cpp
+++ b/src/game-server/gamehandler.cpp
@@ -431,52 +431,6 @@ void GameHandler::processMessage(NetComputer *comp, MessageIn &message)
             computer.character->respawn(); // plausibility check is done by character class
         } break;
 
-
-// The following messages should be handled by the chat server, not the game server.
-#if 0
-
-        case PGMSG_GUILD_CREATE:
-        {
-            std::string name = message.readString();
-            int characterId = computer.character->getDatabaseID();
-            messageMap[characterId] = computer.character;
-            accountHandler->playerCreateGuild(characterId, name);
-        } break;
-
-        case PGMSG_GUILD_INVITE:
-        {
-            short guildId = message.readShort();
-            std::string member = message.readString();
-            int characterId = computer.character->getDatabaseID();
-            messageMap[characterId] = computer.character;
-            accountHandler->playerInviteToGuild(characterId, guildId, member);
-        } break;
-
-        case PGMSG_GUILD_ACCEPT:
-        {
-            std::string guildName = message.readString();
-            int characterId = computer.character->getDatabaseID();
-            messageMap[characterId] = computer.character;
-            accountHandler->playerAcceptInvite(characterId, guildName);
-        } break;
-
-        case PGMSG_GUILD_GET_MEMBERS:
-        {
-            short guildId = message.readShort();
-            int characterId = computer.character->getDatabaseID();
-            messageMap[characterId] = computer.character;
-            accountHandler->getGuildMembers(characterId, guildId);
-        } break;
-
-        case PGMSG_GUILD_QUIT:
-        {
-            short guildId = message.readShort();
-            int characterId = computer.character->getDatabaseID();
-            messageMap[characterId] = computer.character;
-            accountHandler->quitGuild(characterId, guildId);
-        } break;
-#endif
-
         default:
             LOG_WARN("Invalid message type");
             result.writeShort(XXMSG_INVALID);
diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp
index 4694e4b2..5d6c0690 100644
--- a/src/game-server/main-game.cpp
+++ b/src/game-server/main-game.cpp
@@ -259,9 +259,10 @@ void parseOptions(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
     int elapsedWorldTicks;
-
+#ifdef PACKAGE_VERSION
     LOG_INFO("The Mana World Game Server v" << PACKAGE_VERSION);
-
+#endif
+    
     // Parse command line options
     parseOptions(argc, argv);