diff options
| author | Philipp Sehmisch <mana@crushnet.org> | 2010-02-24 21:51:48 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <mana@crushnet.org> | 2010-02-24 22:55:56 +0100 |
| commit | 4cb11db37aeb8052e1fef94965bc48bbc949e7f9 (patch) | |
| tree | bcd945faf1388b96be9d949d9b6d701855b70a9a /src/client.cpp | |
| parent | 48131e2ecfa4d52375d890dac80f9ab1ad45ccf0 (diff) | |
| download | mana-4cb11db37aeb8052e1fef94965bc48bbc949e7f9.tar.gz mana-4cb11db37aeb8052e1fef94965bc48bbc949e7f9.tar.bz2 mana-4cb11db37aeb8052e1fef94965bc48bbc949e7f9.tar.xz mana-4cb11db37aeb8052e1fef94965bc48bbc949e7f9.zip | |
Added the possibility to pass a branding file by command line. Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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); |