From 4cb11db37aeb8052e1fef94965bc48bbc949e7f9 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <mana@crushnet.org>
Date: Wed, 24 Feb 2010 21:51:48 +0100
Subject: Added the possibility to pass a branding file by command line.
 Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/branding.xml | 22 ----------------------
 docs/example.mana | 21 +++++++++++++++++++++
 src/client.cpp    |  5 ++++-
 src/client.h      |  1 +
 src/main.cpp      | 11 ++++++++++-
 5 files changed, 36 insertions(+), 24 deletions(-)
 delete mode 100644 data/branding.xml
 create mode 100644 docs/example.mana

diff --git a/data/branding.xml b/data/branding.xml
deleted file mode 100644
index 38f74e40..00000000
--- a/data/branding.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Branding information
-
-All values in here are the default values which are hardcoded into the Mana
-client. So it would make no difference for the official version when this file
-is missing. It is basically an example for developers of Mana servers to help them
-writing a branding.xml for their servers.
--->
-
-<configuration>
- <option name="appName" value="Mana"/>
- <option name="appShort" value="mana"/>
- <option name="appIcon" value="icons/mana.png"/>
- <option name="loginMusic" value="Magick - Real.ogg"/>
- <option name="defaultServer" value="testing.manasource.org"/>
- <option name="defaultPort" value="9601"/>
- <option name="defaultUpdateHost" value="http://updates.themanaworld.org"/>
- <option name="font" value="fonts/dejavusans.ttf" />
- <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
-</configuration>
diff --git a/docs/example.mana b/docs/example.mana
new file mode 100644
index 00000000..795d8d40
--- /dev/null
+++ b/docs/example.mana
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<!--
+Example branding file
+
+With a branding file you can customize the appearance and various
+other default settings. To use a branding file just pass its
+filename / path as a command line parameter
+-->
+
+<configuration>
+ <option name="appName" value="Mana"/>
+ <option name="appShort" value="mana"/>
+ <option name="appIcon" value="icons/mana.png"/>
+ <option name="loginMusic" value="Magick - Real.ogg"/>
+ <option name="defaultServer" value="testing.manasource.org"/>
+ <option name="defaultPort" value="9601"/>
+ <option name="defaultUpdateHost" value="http://updates.themanaworld.org"/>
+ <option name="font" value="fonts/dejavusans.ttf" />
+ <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
+</configuration>
diff --git a/src/client.cpp b/src/client.cpp
index cf1a6496..5651f968 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -205,7 +205,10 @@ Client::Client(const Options &options):
     mInstance = this;
 
     // Load branding information
-    branding.init("data/branding.xml");
+    if (!options.brandingPath.empty())
+    {
+        branding.init(options.brandingPath);
+    }
 
     initHomeDir(options);
     initScreenshotDir(options.screenshotDir);
diff --git a/src/client.h b/src/client.h
index 47328c4d..32b921dc 100644
--- a/src/client.h
+++ b/src/client.h
@@ -139,6 +139,7 @@ public:
         std::string password;
         std::string character;
         std::string configPath;
+        std::string brandingPath;
         std::string updateHost;
         std::string dataPath;
         std::string homeDir;
diff --git a/src/main.cpp b/src/main.cpp
index 2fb9c112..aaa826cb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,7 +40,7 @@ static void printHelp()
     using std::endl;
 
     std::cout
-        << _("mana") << endl << endl
+        << _("mana [mana-file]") << endl << endl
         << _("Options:") << endl
         << _("  -C --config-file    : Configuration file to use") << endl
         << _("  -d --data           : Directory to load game data from") << endl
@@ -147,6 +147,15 @@ static void parseOptions(int argc, char *argv[], Client::Options &options)
                 break;
         }
     }
+
+    // when there are still options left use the last
+    // one as branding file
+    if (optind < argc)
+    {
+        options.brandingPath = argv[optind];
+    }
+
+
 }
 
 #ifdef WIN32
-- 
cgit v1.2.3-70-g09d2