summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlhofhansl <lhofhansl@yahoo.com>2018-05-14 03:03:39 -0700
committerLoïc Blot <nerzhul@users.noreply.github.com>2018-05-14 12:03:39 +0200
commit0cecc1d1a91e7e3b3b5dd8708b7b416d4b907425 (patch)
tree2cea83df40d90d3cede4c4bf77e65a451daee45a
parent9cc341e91face2c999a96e023ba43444c689164d (diff)
downloadminetest-0cecc1d1a91e7e3b3b5dd8708b7b416d4b907425.tar.gz
minetest-0cecc1d1a91e7e3b3b5dd8708b7b416d4b907425.tar.bz2
minetest-0cecc1d1a91e7e3b3b5dd8708b7b416d4b907425.zip
Make sure color returns to normal after a damage flash (#7332)
-rw-r--r--src/content_cao.cpp2
-rw-r--r--src/content_cao.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 9344b3370..1955559b5 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -990,7 +990,7 @@ void GenericCAO::updateTexturePos()
}
}
-void GenericCAO::updateTextures(const std::string &mod)
+void GenericCAO::updateTextures(std::string mod)
{
ITextureSource *tsrc = m_client->tsrc();
diff --git a/src/content_cao.h b/src/content_cao.h
index a93df664a..d2c8d772e 100644
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -198,8 +198,8 @@ public:
void updateTexturePos();
// std::string copy is mandatory as mod can be a class member and there is a swap
- // on those class members
- void updateTextures(const std::string &mod);
+ // on those class members... do NOT pass by reference
+ void updateTextures(std::string mod);
void updateAnimation();