diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
| commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
| tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/texture_override.cpp | |
| parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
| parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
| download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/texture_override.cpp')
| -rw-r--r-- | src/texture_override.cpp | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/src/texture_override.cpp b/src/texture_override.cpp index 71c8909c8..10d129b87 100644 --- a/src/texture_override.cpp +++ b/src/texture_override.cpp @@ -42,9 +42,9 @@ TextureOverrideSource::TextureOverrideSource(std::string filepath) std::vector<std::string> splitted = str_split(line, ' '); if (splitted.size() != 3) { warningstream << filepath << ":" << line_index - << " Syntax error in texture override \"" << line - << "\": Expected 3 arguments, got " - << splitted.size() << std::endl; + << " Syntax error in texture override \"" << line + << "\": Expected 3 arguments, got " << splitted.size() + << std::endl; continue; } @@ -56,41 +56,31 @@ TextureOverrideSource::TextureOverrideSource(std::string filepath) std::vector<std::string> targets = str_split(splitted[1], ','); for (const std::string &target : targets) { if (target == "top") - texture_override.target |= - static_cast<u8>(OverrideTarget::TOP); + texture_override.target |= static_cast<u8>(OverrideTarget::TOP); else if (target == "bottom") - texture_override.target |= - static_cast<u8>(OverrideTarget::BOTTOM); + texture_override.target |= static_cast<u8>(OverrideTarget::BOTTOM); else if (target == "left") - texture_override.target |= - static_cast<u8>(OverrideTarget::LEFT); + texture_override.target |= static_cast<u8>(OverrideTarget::LEFT); else if (target == "right") - texture_override.target |= - static_cast<u8>(OverrideTarget::RIGHT); + texture_override.target |= static_cast<u8>(OverrideTarget::RIGHT); else if (target == "front") - texture_override.target |= - static_cast<u8>(OverrideTarget::FRONT); + texture_override.target |= static_cast<u8>(OverrideTarget::FRONT); else if (target == "back") - texture_override.target |= - static_cast<u8>(OverrideTarget::BACK); + texture_override.target |= static_cast<u8>(OverrideTarget::BACK); else if (target == "inventory") - texture_override.target |= static_cast<u8>( - OverrideTarget::INVENTORY); + texture_override.target |= static_cast<u8>(OverrideTarget::INVENTORY); else if (target == "wield") - texture_override.target |= - static_cast<u8>(OverrideTarget::WIELD); + texture_override.target |= static_cast<u8>(OverrideTarget::WIELD); else if (target == "sides") - texture_override.target |= - static_cast<u8>(OverrideTarget::SIDES); + texture_override.target |= static_cast<u8>(OverrideTarget::SIDES); else if (target == "all" || target == "*") - texture_override.target |= static_cast<u8>( - OverrideTarget::ALL_FACES); + texture_override.target |= static_cast<u8>(OverrideTarget::ALL_FACES); else { // Report invalid target warningstream << filepath << ":" << line_index - << " Syntax error in texture override \"" - << line << "\": Unknown target \"" << target - << "\"" << std::endl; + << " Syntax error in texture override \"" << line + << "\": Unknown target \"" << target << "\"" + << std::endl; } } |