diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-07-13 13:49:25 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-07-14 02:14:18 +0300 |
| commit | 72938b640199d03d6092366224d3927d5d2a33b9 (patch) | |
| tree | c7e57d69da40085ba835d2e22d1a3d59ab201fe5 /src/resources | |
| parent | c4cef10f92a8ff3fc668e0644d38744dccd06392 (diff) | |
| download | mv-72938b640199d03d6092366224d3927d5d2a33b9.tar.gz mv-72938b640199d03d6092366224d3927d5d2a33b9.tar.bz2 mv-72938b640199d03d6092366224d3927d5d2a33b9.tar.xz mv-72938b640199d03d6092366224d3927d5d2a33b9.zip | |
Fix code style.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/db/palettedb.cpp | 13 | ||||
| -rw-r--r-- | src/resources/map/maptype.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp index 08c8ec85d..1e2f56632 100644 --- a/src/resources/db/palettedb.cpp +++ b/src/resources/db/palettedb.cpp @@ -82,6 +82,18 @@ void PaletteDB::loadPalette() if (line.empty() || line[0] == '#') continue; +#ifdef WIN32 + unsigned int r; + unsigned int g; + unsigned int b; + + if (sscanf(line.c_str(), "%10u %10u %10u\t%100s", + &r, &g, &b, name) == 4) + { + name[100] = 0; + mColors[name] = DyeColor(r, g, b); + } +#else unsigned char r; unsigned char g; unsigned char b; @@ -92,6 +104,7 @@ void PaletteDB::loadPalette() name[100] = 0; mColors[name] = DyeColor(r, g, b); } +#endif } } diff --git a/src/resources/map/maptype.h b/src/resources/map/maptype.h index 9894fe631..ccaf7c601 100644 --- a/src/resources/map/maptype.h +++ b/src/resources/map/maptype.h @@ -35,6 +35,6 @@ namespace MapType SPECIAL4 = 5, BLACKWHITE = 6 }; -} +} // namespace MapType #endif // RESOURCES_MAP_MAPTYPE_H |