games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-25 21:38:59 +02:00
Code Issues Releases Activity

Removed unused property

Browse Source
This commit is contained in:
Ivan Savenko 2023-09-18 14:03:21 +03:00
parent 52cb4505e1
commit dfc72134f2
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/schemas/creature.json
View File

@ -250,10 +250,6 @@
"timeBetweenFidgets" : {
"type" : "number",
"description" : "How often creature will play idling animation"
},
"troopCountLocationOffset" : {
"type" : "number",
"description" : "Position of troop count label?"
}
}
},

4
lib/CCreatureHandler.cpp
View File

@ -844,7 +844,8 @@ void CCreatureHandler::loadUnitAnimInfo(JsonNode & graphics, CLegacyConfigParser
missile["frameAngles"].Vector().push_back(entry);
}
graphics["troopCountLocationOffset"].Float() = parser.readNumber();
// Unused property "troopCountLocationOffset"
parser.readNumber();
missile["attackClimaxFrame"].Float() = parser.readNumber();
@ -857,7 +858,6 @@ void CCreatureHandler::loadUnitAnimInfo(JsonNode & graphics, CLegacyConfigParser
void CCreatureHandler::loadJsonAnimation(CCreature * cre, const JsonNode & graphics) const
{
cre->animation.timeBetweenFidgets = graphics["timeBetweenFidgets"].Float();
cre->animation.troopCountLocationOffset = static_cast<int>(graphics["troopCountLocationOffset"].Float());
const JsonNode & animationTime = graphics["animationTime"];
cre->animation.walkAnimationTime = animationTime["walk"].Float();

10
lib/CCreatureHandler.h
View File

@ -96,7 +96,7 @@ public:
upperRightMissleOffsetY, rightMissleOffsetY, lowerRightMissleOffsetY;
std::vector<double> missleFrameAngles;
int troopCountLocationOffset, attackClimaxFrame;
int attackClimaxFrame;
AnimationPath projectileImageName;
std::vector<RayColor> projectileRay;
@ -108,13 +108,6 @@ public:
h & idleAnimationTime;
h & walkAnimationTime;
h & attackAnimationTime;
if (version < 814)
{
float unused = 0.f;
h & unused;
}
h & upperRightMissleOffsetX;
h & rightMissleOffsetX;
h & lowerRightMissleOffsetX;
@ -122,7 +115,6 @@ public:
h & rightMissleOffsetY;
h & lowerRightMissleOffsetY;
h & missleFrameAngles;
h & troopCountLocationOffset;
h & attackClimaxFrame;
h & projectileImageName;
h & projectileRay;