From 6ccb5835ff55d85156be91473c598eca9d6cb9a6 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Wed, 4 Nov 2020 16:57:41 +0100 Subject: Revert "Make Lint Happy" This reverts commit ad148587dcf5244c2d2011dba339786c765c54c4. --- src/texture_override.cpp | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) (limited to 'src/texture_override.cpp') 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 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 targets = str_split(splitted[1], ','); for (const std::string &target : targets) { if (target == "top") - texture_override.target |= - static_cast(OverrideTarget::TOP); + texture_override.target |= static_cast(OverrideTarget::TOP); else if (target == "bottom") - texture_override.target |= - static_cast(OverrideTarget::BOTTOM); + texture_override.target |= static_cast(OverrideTarget::BOTTOM); else if (target == "left") - texture_override.target |= - static_cast(OverrideTarget::LEFT); + texture_override.target |= static_cast(OverrideTarget::LEFT); else if (target == "right") - texture_override.target |= - static_cast(OverrideTarget::RIGHT); + texture_override.target |= static_cast(OverrideTarget::RIGHT); else if (target == "front") - texture_override.target |= - static_cast(OverrideTarget::FRONT); + texture_override.target |= static_cast(OverrideTarget::FRONT); else if (target == "back") - texture_override.target |= - static_cast(OverrideTarget::BACK); + texture_override.target |= static_cast(OverrideTarget::BACK); else if (target == "inventory") - texture_override.target |= static_cast( - OverrideTarget::INVENTORY); + texture_override.target |= static_cast(OverrideTarget::INVENTORY); else if (target == "wield") - texture_override.target |= - static_cast(OverrideTarget::WIELD); + texture_override.target |= static_cast(OverrideTarget::WIELD); else if (target == "sides") - texture_override.target |= - static_cast(OverrideTarget::SIDES); + texture_override.target |= static_cast(OverrideTarget::SIDES); else if (target == "all" || target == "*") - texture_override.target |= static_cast( - OverrideTarget::ALL_FACES); + texture_override.target |= static_cast(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; } } -- cgit v1.2.3