summaryrefslogtreecommitdiff
path: root/src/resources/dye.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/dye.cpp')
-rw-r--r--src/resources/dye.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 35a8ca89..aa4d6835 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -1,9 +1,8 @@
/*
- * Aethyra
+ * The Mana World
* Copyright (C) 2007 The Mana World Development Team
*
- * This file is part of Aethyra based on original code
- * from The Mana World.
+ * This file is part of The Mana World.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,18 +19,22 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sstream>
+#include "resources/dye.h"
-#include "dye.h"
+#include "log.h"
-#include "../log.h"
+#include <sstream>
DyePalette::DyePalette(const std::string &description)
{
int size = description.length();
- if (size == 0 || description[0] != '#')
+ if (size == 0)
+ return;
+ if (description[0] != '#')
+ {
// TODO: load palette from file.
return;
+ }
int pos = 1;
for (;;)