Simplified logging for the sake of simplicity.

4 files changed, 11 insertions, 11 deletions

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 5032b196..9cf20f94 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -211,11 +211,11 @@ void CharSelectDialog::serverCharSelect()
         flush();
     }
 
-    log("CharSelect", "Packet ID: %x, Length: %d, Packet_in_size %d",
+    log("CharSelect: Packet ID: %x, Length: %d, Packet_in_size %d",
             RFIFOW(0),
             get_length(RFIFOW(0)),
             RFIFOW(2));
-    log("CharSelect", "In_size: %d", in_size);
+    log("CharSelect: In_size: %d", in_size);
 
     if (RFIFOW(0) == 0x0071) {
         while (in_size < 28) {
@@ -229,8 +229,8 @@ void CharSelectDialog::serverCharSelect()
         map_port = RFIFOW(26);
         state = GAME;
 
-        log("CharSelect", "Map: %s", map_name);
-        log("CharSelect", "Server: %s:%d", iptostring(map_address), map_port);
+        log("CharSelect: Map: %s", map_name);
+        log("CharSelect: Server: %s:%d", iptostring(map_address), map_port);
         RFIFOSKIP(28);
         close_session();
     }
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index c0f1c523..a0988b5a 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -195,7 +195,7 @@ void server_char_server(int serverIndex) {
         }
         state = CHAR_SELECT;
 
-        log("CharServer", "Player: %s (Packet ID: %x, Length: %d",
+        log("CharServer: Player: %s (Packet ID: %x, Length: %d",
                 char_info->name, RFIFOW(0), RFIFOW(2));
 
 
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 5496c01b..3c58cde9 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -105,7 +105,7 @@ void LoginDialog::action(const std::string& eventId)
 {
     if (eventId == "ok") {
         const std::string user = userField->getText();
-        log("Network", "Username is %s", user.c_str());
+        log("Network: Username is %s", user.c_str());
 
         // Store config settings
         config.setValue("remember", keepCheck->isMarked());
@@ -191,8 +191,8 @@ void server_login(const std::string& user, const std::string& pass) {
     while ((in_size < 23) || (out_size > 0)) {
         flush();
     }
-    log("Network", "Packet ID: %x", RFIFOW(0));
-    log("Network", "Packet length: %d", get_packet_length(RFIFOW(0)));
+    log("Network: Packet ID: %x", RFIFOW(0));
+    log("Network: Packet length: %d", get_packet_length(RFIFOW(0)));
 
     if (RFIFOW(0) == 0x0069) {
         while (in_size < RFIFOW(2)) {
@@ -211,10 +211,10 @@ void server_login(const std::string& user, const std::string& pass) {
             server_info[i].port = RFIFOW(47 + 32 * i + 4);
             state = CHAR_SERVER;
         }
-        log("Network", "Server: %s (%s:%d)", server_info[0].name,
+        log("Network: Server: %s (%s:%d)", server_info[0].name,
                 iptostring(server_info[0].address),
                 server_info[0].port);
-        log("Network", "Users: %d", server_info[0].online_users);
+        log("Network: Users: %d", server_info[0].online_users);
         RFIFOSKIP(RFIFOW(2));
     }
     else if (RFIFOW(0) == 0x006a) {
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 6305d56a..151c3ab6 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -187,7 +187,7 @@ void Setup::action(const std::string& eventId)
             }
             catch (const char *err) {
                 new OkDialog(this, "Sound Engine", err);
-                warning(err);   
+                log("Warning: %s", err);   
             }
         } else {
             config.setValue("sound", 0);