games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Fix initialization of CSpell::AnimationItem

Browse Source
This commit is contained in:
AlexVinS
2015-09-12 23:52:04 +03:00
parent cbd8900c0b
commit 3029b1a432
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/spells/CSpellHandler.cpp
View File

@@ -622,6 +622,14 @@ void CSpell::setupMechanics()
mechanics = ISpellMechanics::createMechanics(this); mechanics = ISpellMechanics::createMechanics(this);
} }
///CSpell::AnimationInfo
CSpell::AnimationItem::AnimationItem()
:resourceName(""),verticalPosition(VerticalPosition::TOP),pause(0)
{
}
///CSpell::AnimationInfo ///CSpell::AnimationInfo
CSpell::AnimationInfo::AnimationInfo() CSpell::AnimationInfo::AnimationInfo()
{ {
@@ -958,7 +966,6 @@ CSpell * CSpellHandler::loadFromJson(const JsonNode & json)
for(const JsonNode & item : queueNode) for(const JsonNode & item : queueNode)
{ {
CSpell::TAnimation newItem; CSpell::TAnimation newItem;
newItem.verticalPosition = VerticalPosition::TOP;
if(item.getType() == JsonNode::DATA_STRING) if(item.getType() == JsonNode::DATA_STRING)
newItem.resourceName = item.String(); newItem.resourceName = item.String();

2
lib/spells/CSpellHandler.h
View File

@@ -106,6 +106,8 @@ public:
VerticalPosition verticalPosition; VerticalPosition verticalPosition;
int pause; int pause;
AnimationItem();
template <typename Handler> void serialize(Handler & h, const int version) template <typename Handler> void serialize(Handler & h, const int version)
{ {
h & resourceName & verticalPosition; h & resourceName & verticalPosition;