summaryrefslogtreecommitdiff
path: root/src/client/content_cao.h
diff options
context:
space:
mode:
authorSmallJoker <mk939@ymail.com>2019-05-26 09:54:23 +0200
committerSmallJoker <mk939@ymail.com>2019-05-26 09:54:26 +0200
commita1459a9eac4eeb35a6c578a8b8f96393f87ed53d (patch)
treec4a69c8d6434f2be5d2c38f43d75eb711240f1e0 /src/client/content_cao.h
parent40dadecb6ece6c9bbf7739e3a44ace25c0716dec (diff)
downloadminetest-a1459a9eac4eeb35a6c578a8b8f96393f87ed53d.tar.gz
minetest-a1459a9eac4eeb35a6c578a8b8f96393f87ed53d.tar.bz2
minetest-a1459a9eac4eeb35a6c578a8b8f96393f87ed53d.zip
Fix persistent ^[brighten after damage again (#5739)
The old texture modifier is restored by passing `m_previous_texture_modifier`. Either copy it manually or let the function parameter do that. Victims so far: 8e0b80a Apr 2018 eb2bda7 May 2019
Diffstat (limited to 'src/client/content_cao.h')
-rw-r--r--src/client/content_cao.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/content_cao.h b/src/client/content_cao.h
index 320607061..ca1518fb2 100644
--- a/src/client/content_cao.h
+++ b/src/client/content_cao.h
@@ -225,7 +225,9 @@ public:
void updateTexturePos();
- void updateTextures(const std::string &modref);
+ // ffs this HAS TO BE a string copy! See #5739 if you think otherwise
+ // Reason: updateTextures(m_previous_texture_modifier);
+ void updateTextures(std::string mod);
void updateAnimation();