Merged the tmwserv client with the eAthena client

This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.

In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.

Conflicts:
	Everywhere!

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index ee5613bc..58439316 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -534,24 +534,24 @@ void Window::setGuiAlpha()
     mAlphaChanged = false;
 }
 
-void Window::loadSkin(const std::string &filename)
+void Window::loadSkin(const std::string &fileName)
 {
     const std::string windowId = Window::getId();
 
     ResourceManager *resman = ResourceManager::getInstance();
 
-    logger->log("Loading Window Skin '%s'.", filename.c_str());
+    logger->log("Loading Window Skin '%s'.", fileName.c_str());
     logger->log("Loading Window ID '%s'.", windowId.c_str());
 
 
-    if (filename.empty())
+    if (fileName.empty())
         logger->error("Window::loadSkin(): Invalid File Name.");
 
     // TODO:
     // If there is an error loading the specified file, we should try to revert
     // to a 'default' skin file. Only if the 'default' skin file can't be loaded
     // should we have a terminating error.
-    XML::Document doc(filename);
+    XML::Document doc(fileName);
     xmlNodePtr rootNode = doc.rootNode();
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset"))