Added logger use in some files that could tell things already.

3 files changed, 25 insertions, 16 deletions

diff --git a/src/connectionhandler.cpp b/src/connectionhandler.cpp
index c3090bbe..0631e240 100644
--- a/src/connectionhandler.cpp
+++ b/src/connectionhandler.cpp
@@ -23,6 +23,7 @@
 
 #include "connectionhandler.h"
 #include "netsession.h"
+#include "log.h"
 
 #ifdef SCRIPT_SUPPORT
 #include "script.h"
@@ -39,13 +40,13 @@ void ConnectionHandler::startListen(ListenThreadData *ltd)
     // Allocate a socket set
     SDLNet_SocketSet set = SDLNet_AllocSocketSet(MAX_CLIENTS);
     if (!set) {
-        printf("SDLNet_AllocSocketSet: %s\n", SDLNet_GetError());
+        logger->log("SDLNet_AllocSocketSet: %s", SDLNet_GetError());
         exit(1);
     }
 
     // Add the server socket to the socket set
     if (SDLNet_TCP_AddSocket(set, ltd->socket) < 0) {
-        printf("SDLNet_AddSocket: %s\n", SDLNet_GetError());
+        logger->log("SDLNet_AddSocket: %s", SDLNet_GetError());
         exit(1);
     }
 
@@ -57,12 +58,13 @@ void ConnectionHandler::startListen(ListenThreadData *ltd)
         if (numready == -1)
         {
             printf("SDLNet_CheckSockets: %s\n", SDLNet_GetError());
+            logger->log("SDLNet_CheckSockets: %s", SDLNet_GetError());
             // When this is a system error, perror may help us
             perror("SDLNet_CheckSockets");
         }
         else if (numready > 0)
         {
-            printf("%d sockets with activity!\n", numready);
+            logger->log("%d sockets with activity!\n", numready);
 
             // Check server socket
             if (SDLNet_SocketReady(ltd->socket))
@@ -72,13 +74,13 @@ void ConnectionHandler::startListen(ListenThreadData *ltd)
                 {
                     // Add the client socket to the socket set
                     if (SDLNet_TCP_AddSocket(set, client) < 0) {
-                        printf("SDLNet_AddSocket: %s\n", SDLNet_GetError());
+                        logger->log("SDLNet_AddSocket: %s", SDLNet_GetError());
                     }
                     else {
                         NetComputer *comp = new NetComputer(this);
                         clients[comp] = client;
                         computerConnected(comp);
-                        printf("%d clients connected\n", clients.size());
+                        logger->log("%d clients connected", clients.size());
                     }
                 }
             }
@@ -105,9 +107,9 @@ void ConnectionHandler::startListen(ListenThreadData *ltd)
                     else
                     {
                         buffer[result] = 0;
-                        printf("Received %s\n", buffer);
+                        logger->log("Received %s", buffer);
 #ifdef SCRIPT_SUPPORT
-			script->message(buffer);
+                        script->message(buffer);
 #endif
                     }
                 }
@@ -133,12 +135,12 @@ void ConnectionHandler::startListen(ListenThreadData *ltd)
 
 void ConnectionHandler::computerConnected(NetComputer *comp)
 {
-    printf("A client connected!\n");
+    logger->log("A client connected!");
 }
 
 void ConnectionHandler::computerDisconnected(NetComputer *comp)
 {
-    printf("A client disconnected!\n");
+    logger->log("A client disconnected!");
 }
 
 void ConnectionHandler::registerHandler(
diff --git a/src/main.cpp b/src/main.cpp
index 300dad69..c3b86cf5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,6 +21,8 @@
  *  $Id$
  */
 
+#define TMWSERV_VERSION "0.0.1"
+
 #include <iostream>
 #include "netsession.h"
 #include "connectionhandler.h"
@@ -61,7 +63,7 @@ Uint32 worldTick(Uint32 interval, void *param)
     SDL_Event event;
     event.type = TMW_WORLD_TICK;
     if (SDL_PushEvent(&event)) {
-        printf("Warning: couldn't push world tick into event queue!\n");
+        logger->log("Warning: couldn't push world tick into event queue!");
     }
     return interval;
 }
@@ -71,9 +73,12 @@ Uint32 worldTick(Uint32 interval, void *param)
  */
 void initialize()
 {
+    // Initialize the logger
+    logger = new Logger(LOG_FILE);
+
     // Initialize SDL
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) == -1) {
-        printf("SDL_Init: %s\n", SDL_GetError());
+        logger->log("SDL_Init: %s", SDL_GetError());
         exit(1);
     }
 
@@ -82,7 +87,7 @@ void initialize()
 
     // Initialize SDL_net
     if (SDLNet_Init() == -1) {
-        printf("SDLNet_Init: %s\n", SDLNet_GetError());
+        logger->log("SDLNet_Init: %s", SDLNet_GetError());
         exit(2);
     }
 
@@ -91,15 +96,15 @@ void initialize()
 
     // Initialize scripting subsystem
 #ifdef SCRIPT_SUPPORT
+
+    logger->log("Script Language %s", scriptLanguage.c_str());
+
     if (scriptLanguage == "squirrel")
     {
         script = new ScriptSquirrel();
         script->init();
     }
 #endif
-
-    // Initialize the logger
-    logger = new Logger(LOG_FILE);
 }
 
 /**
@@ -138,7 +143,7 @@ int main(int argc, char *argv[])
     //AccountHandler *accountHandler = new AccountHandler();
     //connectionHandler->registerHandler(C2S_LOGIN, accountHandler);
 
-    logger->log("The Mana World Server v0.0.1");
+    logger->log("The Mana World Server v%s", TMWSERV_VERSION);
     session->startListen(connectionHandler, SERVER_PORT);
     logger->log("Listening on port %d...", SERVER_PORT);
 
diff --git a/src/skill.cpp b/src/skill.cpp
index 041eab99..e91c1354 100644
--- a/src/skill.cpp
+++ b/src/skill.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "skill.h"
+#include "log.h"
 
 Skill::~Skill() {
     //cleanup
@@ -50,6 +51,7 @@ bool Skill::deleteSkill(const std::string &ident, bool delTree) {
     //prevent deletion of self
     if (ident == id) {
 	std::cerr << "Error: Skill: Attempt to delete self." << std::endl;
+    logger->log("Error: Skill: Attempt to delete self.");
 	return false;
     }