summaryrefslogtreecommitdiffstats
path: root/src/graphics/engine/engine.cpp
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2013-05-26 11:34:53 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2013-05-26 11:34:53 +0200
commitb41957f2f95d8f62817705a1c82322d9463d28a2 (patch)
tree0ff331e8dd61039ecc193add91b05e5fe07c7651 /src/graphics/engine/engine.cpp
parentff101c6973baeac63f8027118d4dad644354d869 (diff)
downloadcolobot-b41957f2f95d8f62817705a1c82322d9463d28a2.tar.gz
colobot-b41957f2f95d8f62817705a1c82322d9463d28a2.tar.bz2
colobot-b41957f2f95d8f62817705a1c82322d9463d28a2.zip
Corrected some valgrind issues
* fixed several uninitialized variable issues * fixed possible memory corruption in CEngine
Diffstat (limited to 'src/graphics/engine/engine.cpp')
-rw-r--r--src/graphics/engine/engine.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp
index 5bd51fe..b697a37 100644
--- a/src/graphics/engine/engine.cpp
+++ b/src/graphics/engine/engine.cpp
@@ -998,7 +998,8 @@ void CEngine::ChangeSecondTexture(int objRank, const std::string& tex2Name)
continue; // already new
EngineBaseObjTexTier& newP2 = AddLevel2(p1, p2.tex1Name, tex2Name);
- newP2.next.swap(p2.next);
+ newP2.next.insert(newP2.next.end(), p2.next.begin(), p2.next.end());
+ p2.next.clear();
}
}