Skip to content
Permalink
Browse files

Revert a const ref on update texture

if mod is a reference to a class member a variable swap breaks.
We should find a way to keep this const ref if possible.
Added a comment about this in header
  • Loading branch information...
nerzhul committed Apr 21, 2017
1 parent 113c85a commit 4f4e2e3e838fc640e45714d4666bc5d6b0aa8a25
Showing with 4 additions and 2 deletions.
  1. +1 −1 src/content_cao.cpp
  2. +3 −1 src/content_cao.h
@@ -1313,7 +1313,7 @@ void GenericCAO::updateTexturePos()
}
}

void GenericCAO::updateTextures(const std::string &mod)
void GenericCAO::updateTextures(std::string mod)
{
ITextureSource *tsrc = m_client->tsrc();

@@ -200,7 +200,9 @@ class GenericCAO : public ClientActiveObject

void updateTexturePos();

void updateTextures(const std::string &mod);
// std::string copy is mandatory as mod can be a class member and there is a swap
// on those class members
void updateTextures(std::string mod);

void updateAnimation();

0 comments on commit 4f4e2e3

Please sign in to comment.
You can’t perform that action at this time.