Skip to content

Commit

Permalink
Make sure color returns to normal after a damage flash (#7332)
Browse files Browse the repository at this point in the history
  • Loading branch information
lhofhansl authored and nerzhul committed May 14, 2018
1 parent 9cc341e commit 0cecc1d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/content_cao.cpp
Expand Up @@ -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();

Expand Down
4 changes: 2 additions & 2 deletions src/content_cao.h
Expand Up @@ -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();

Expand Down

0 comments on commit 0cecc1d

Please sign in to comment.