From: lhofhansl Date: Mon, 14 May 2018 10:03:39 +0000 (-0700) Subject: Make sure color returns to normal after a damage flash (#7332) X-Git-Tag: 5.0.0~413 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0cecc1d1a91e7e3b3b5dd8708b7b416d4b907425;p=oweals%2Fminetest.git Make sure color returns to normal after a damage flash (#7332) --- 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();