Reduced noise in log file.

4 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ad5ac46..8f41a806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* src/resources/resourcemanager.h, src/resources/resource.h,
 	src/resources/resourcemanager.cpp, src/resources/resource.cpp: Delayed
 	resource deletion by 30 seconds.
+	* src/net/connection.cpp, src/resources/mapreader.cpp,
+	src/net/network.cpp: Reduced noise in log file.
 
 2007-11-16  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
diff --git a/src/net/connection.cpp b/src/net/connection.cpp
index ce060ae7..caaa0ce1 100644
--- a/src/net/connection.cpp
+++ b/src/net/connection.cpp
@@ -96,7 +96,7 @@ void Net::Connection::send(const MessageOut &msg)
         return;
     }
 
-    logger->log("Sending message of size %d...", msg.getDataSize());
+    //logger->log("Sending message of size %d...", msg.getDataSize());
 
     ENetPacket *packet = enet_packet_create(msg.getData(),
                                             msg.getDataSize(),
diff --git a/src/net/network.cpp b/src/net/network.cpp
index 6b29ff33..7cf4bf49 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -124,8 +124,8 @@ namespace
             MessageHandlerIterator iter = mMessageHandlers.find(msg.getId());
 
             if (iter != mMessageHandlers.end()) {
-                logger->log("Received packet %x (%i B)",
-                        msg.getId(), msg.getLength());
+                //logger->log("Received packet %x (%i B)",
+                //        msg.getId(), msg.getLength());
                 iter->second->handleMessage(msg);
             }
             else {
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 940ded36..a07fc18d 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -248,8 +248,16 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
             {
                 if (xmlStrEqual(objectNode->name, BAD_CAST "object"))
                 {
-                    std::string objName = XML::getProperty(objectNode, "name", "");
                     std::string objType = XML::getProperty(objectNode, "type", "");
+
+                    if (objType == "WARP" || objType == "NPC" ||
+                        objType == "SCRIPT" || objType == "SPAWN")
+                    {
+                        // Silently skip server-side objects.
+                        continue;
+                    }
+
+                    std::string objName = XML::getProperty(objectNode, "name", "");
                     int objX = XML::getProperty(objectNode, "x", 0);
                     int objY = XML::getProperty(objectNode, "y", 0);