games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Introduce dummy spell animation/ animation pause configuration

Browse Source 
* save format changed with backward compatibility, UNTESTED
This commit is contained in:
AlexVinS 2015-03-22 13:49:14 +03:00
parent 832d69ec11
commit 98ea8bf314
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/schemas/spell.json
View File

@ -12,6 +12,10 @@
"type": "array",
"items":{
"anyOf":[
{
//dummy animation, pause, Value - frame count
"type": "number"
},
{
//assumed verticalPosition: top
"type": "string",

4
lib/Connection.h
View File

@ -27,8 +27,8 @@
#include "mapping/CCampaignHandler.h" //for CCampaignState
#include "rmg/CMapGenerator.h" // for CMapGenOptions
const ui32 version = 753;
const ui32 minSupportedVersion = version;
const ui32 version = 754;
const ui32 minSupportedVersion = 753;
class CISer;
class COSer;

5
lib/spells/CSpellHandler.cpp
View File

@ -970,6 +970,11 @@ CSpell * CSpellHandler::loadFromJson(const JsonNode & json)
if("bottom" == vPosStr)
newItem.verticalPosition = VerticalPosition::BOTTOM;
}
else if(item.getType() == JsonNode::DATA_FLOAT)
{
newItem.pause = item.Float();
}
q.push_back(newItem);
}
};

9
lib/spells/CSpellHandler.h
View File

@ -104,10 +104,19 @@ public:
{
std::string resourceName;
VerticalPosition verticalPosition;
int pause;
template <typename Handler> void serialize(Handler & h, const int version)
{
h & resourceName & verticalPosition;
if(version >= 754)
{
h & pause;
}
else if(!h.saving)
{
pause = 0;
}
}
};