Make sure color returns to normal after a damage flash (#7332)

lhofhansl · nerzhul · commit 0cecc1d1a91e · 2018-05-14T12:03:39.000+02:00
diff --git 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
@@ -198,8 +198,8 @@ class GenericCAO : public ClientActiveObject
 	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();
 

Original file line number	Diff line number	Diff line change
`@@ -990,7 +990,7 @@ void GenericCAO::updateTexturePos()`
`990`	`990`	`}`
`991`	`991`	`}`
`992`	`992`
`993`		`-void GenericCAO::updateTextures(const std::string &mod)`
	`993`	`+void GenericCAO::updateTextures(std::string mod)`
`994`	`994`	`{`
`995`	`995`	`ITextureSource *tsrc = m_client->tsrc();`
`996`	`996`