1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00

Merge pull request #302 from FeniksFire/develop

Fix http://bugs.vcmi.eu/view.php?id=2677.
This commit is contained in:
Alexander Shishkin
2017-05-28 14:36:12 +03:00
committed by GitHub

View File

@@ -54,7 +54,8 @@ ObjectTemplate::ObjectTemplate():
visitDir(8|16|32|64|128), // all but top
id(Obj::NO_OBJ),
subid(0),
printPriority(0)
printPriority(0),
stringID("")
{
}
@@ -65,7 +66,8 @@ ObjectTemplate::ObjectTemplate(const ObjectTemplate& other):
subid(other.subid),
printPriority(other.printPriority),
animationFile(other.animationFile),
editorAnimationFile(other.editorAnimationFile)
editorAnimationFile(other.editorAnimationFile),
stringID(other.stringID)
{
//default copy constructor is failing with usedTiles this for unknown reason
@@ -83,6 +85,7 @@ ObjectTemplate & ObjectTemplate::operator=(const ObjectTemplate & rhs)
printPriority = rhs.printPriority;
animationFile = rhs.animationFile;
editorAnimationFile = rhs.editorAnimationFile;
stringID = rhs.stringID;
usedTiles.clear();
usedTiles.resize(rhs.usedTiles.size());