summaryrefslogtreecommitdiff
path: root/src/resources/dye.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-03-31 16:54:22 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-01 03:56:16 +0300
commit761682b6254a3d43e65ff45e07683c61afa6f1e4 (patch)
tree2ee462840f3aadb1e96bfa5c6784ec2cc0d2861a /src/resources/dye.cpp
parenta39f63cdfa5ce15b22f294a8bb1db3a036ce462d (diff)
downloadmv-761682b6254a3d43e65ff45e07683c61afa6f1e4.tar.gz
mv-761682b6254a3d43e65ff45e07683c61afa6f1e4.tar.bz2
mv-761682b6254a3d43e65ff45e07683c61afa6f1e4.tar.xz
mv-761682b6254a3d43e65ff45e07683c61afa6f1e4.zip
Last part of fixes.
Diffstat (limited to 'src/resources/dye.cpp')
-rw-r--r--src/resources/dye.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 3b2d20054..a4e101ff8 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -236,10 +236,10 @@ Dye::Dye(const std::string &description)
if (description.empty())
return;
- std::string::size_type next_pos = 0, length = description.length();
+ size_t next_pos = 0, length = description.length();
do
{
- std::string::size_type pos = next_pos;
+ size_t pos = next_pos;
next_pos = description.find(';', pos);
if (next_pos == std::string::npos)
@@ -313,7 +313,7 @@ void Dye::update(int color[3]) const
void Dye::instantiate(std::string &target, const std::string &palettes)
{
- std::string::size_type next_pos = target.find('|');
+ size_t next_pos = target.find('|');
if (next_pos == std::string::npos || palettes.empty())
return;
@@ -322,10 +322,10 @@ void Dye::instantiate(std::string &target, const std::string &palettes)
std::ostringstream s;
s << target.substr(0, next_pos);
- std::string::size_type last_pos = target.length(), pal_pos = 0;
+ size_t last_pos = target.length(), pal_pos = 0;
do
{
- std::string::size_type pos = next_pos;
+ size_t pos = next_pos;
next_pos = target.find(';', pos);
if (next_pos == std::string::npos)
@@ -333,7 +333,7 @@ void Dye::instantiate(std::string &target, const std::string &palettes)
if (next_pos == pos + 1 && pal_pos != std::string::npos)
{
- std::string::size_type pal_next_pos = palettes.find(';', pal_pos);
+ size_t pal_next_pos = palettes.find(';', pal_pos);
s << target[pos] << ':';
if (pal_next_pos == std::string::npos)
{