From 2e3f508a5693a9a4b1d18da3f5c233a4d4bbdee2 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Fri, 13 Jan 2017 10:33:21 +0200
Subject: [PATCH] Fix broken default keys and enable master server in configs

---
 apps/openmw-mp/MasterClient.cpp        |  2 +-
 files/tes3mp/tes3mp-client-default.cfg | 11 ++++++-----
 files/tes3mp/tes3mp-server-default.cfg |  7 +++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/openmw-mp/MasterClient.cpp b/apps/openmw-mp/MasterClient.cpp
index 3eebaac2a..b8f4121f3 100644
--- a/apps/openmw-mp/MasterClient.cpp
+++ b/apps/openmw-mp/MasterClient.cpp
@@ -147,7 +147,7 @@ void MasterClient::Update()
         if (response == "Created")
             LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Server registered on the master server.");
         else if (response == "Accepted")
-            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Server updated information about himself on the master server.");
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Sent info update to master server.");
         else if (response == "bad request")
         {
             LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Update rate is too low, and the master server has deleted information about"
diff --git a/files/tes3mp/tes3mp-client-default.cfg b/files/tes3mp/tes3mp-client-default.cfg
index 7eb47f3f0..079f54148 100644
--- a/files/tes3mp/tes3mp-client-default.cfg
+++ b/files/tes3mp/tes3mp-client-default.cfg
@@ -1,7 +1,6 @@
 [General]
 server = mp.tes3mp.com
 port = 25565
-
 # 0 - Verbose (spam), 1 - Info, 2 - Warnings, 3 - Errors, 4 - Only fatal errors
 loglevel = 0
 
@@ -10,12 +9,14 @@ address = master.tes3mp.com
 port = 8080
 
 [Chat]
-# Use https://wiki.libsdl.org/SDL_Keycode for rebinding keys
-keySay = Y # For chatting
-keyChatMode = F2 # For enabling or disabling the chat window
+# Use https://wiki.libsdl.org/SDL_Keycode to find the correct key codes when rebinding
+#
+# For chatting
+keySay = Y
+# For enabling or disabling the chat window
+keyChatMode = F2
 x = 0
 y = 0
 w = 390
 h = 250
 delay = 5.0 # How long the message will be displayed in hidden mode
-
diff --git a/files/tes3mp/tes3mp-server-default.cfg b/files/tes3mp/tes3mp-server-default.cfg
index 3ced51c57..85566f089 100644
--- a/files/tes3mp/tes3mp-server-default.cfg
+++ b/files/tes3mp/tes3mp-server-default.cfg
@@ -3,9 +3,8 @@ address = 0.0.0.0
 port = 25565
 players = 64
 hostname = My TES3MP server
-
 # 0 - Verbose (spam), 1 - Info, 2 - Warnings, 3 - Errors, 4 - Only fatal errors
-loglevel = 0
+loglevel = 1
 
 [Plugins]
 #home = ~/local/openmw/tes3mp
@@ -13,7 +12,7 @@ home = ~/ClionProjects/PS-dev
 plugins = server.lua
 
 [MasterServer]
-enabled = false
+enabled = true
 address = master.tes3mp.com
 port = 8080
-rate = 1000
\ No newline at end of file
+rate = 1000