summaryrefslogtreecommitdiff
path: root/src/resources/palettedb.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-21 23:11:05 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-21 23:22:06 +0300
commit67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf (patch)
tree0efb80c3cf13e5f859c522da923cf7fddac90bc5 /src/resources/palettedb.cpp
parent73f36dd1934b3d0cdd52f13cab15480de4d0b9d2 (diff)
downloadmv-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.tar.gz
mv-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.tar.bz2
mv-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.tar.xz
mv-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.zip
fix code style and some other fixes after auto checks.
Diffstat (limited to 'src/resources/palettedb.cpp')
-rw-r--r--src/resources/palettedb.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/resources/palettedb.cpp b/src/resources/palettedb.cpp
index c770a9cdc..1219601ce 100644
--- a/src/resources/palettedb.cpp
+++ b/src/resources/palettedb.cpp
@@ -25,8 +25,6 @@
#include "resources/dyecolor.h"
#include "resources/resourcemanager.h"
-#include "utils/stringvector.h"
-
#include <map>
#include "debug.h"
@@ -87,8 +85,11 @@ void PaletteDB::loadPalette()
unsigned int g;
unsigned int b;
- if (sscanf(line.c_str(), "%u %u %u\t%s", &r, &g, &b, name) == 4)
+ if (sscanf(line.c_str(), "%10u %10u %10u\t%100s",
+ &r, &g, &b, name) == 4)
+ {
mColors[name] = DyeColor(r, g, b);
+ }
}
}