games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

#2977 - fix obstackle path deserialization

Browse Source
This commit is contained in:
Andrii Danylchenko 2023-10-29 16:04:48 +02:00
parent 98cb2abd01
commit 73b89d4e84
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/battle/BattleObstacleController.cpp
View File

@ -27,6 +27,7 @@
#include "../../CCallback.h"
#include "../../lib/battle/CObstacleInstance.h"
#include "../../lib/ObstacleHandler.h"
#include "../../lib/serializer/JsonDeserializer.h"
BattleObstacleController::BattleObstacleController(BattleInterface & owner):
owner(owner),
@ -77,7 +78,14 @@ void BattleObstacleController::obstacleRemoved(const std::vector<ObstacleChanges
continue;
}
auto animation = GH.renderHandler().loadAnimation(AnimationPath::fromJson(obstacle["appearAnimation"]));
AnimationPath animationPath;
JsonDeserializer ser(nullptr, obstacle);
ser.serializeStruct("appearAnimation", animationPath);
if(animationPath.empty())
continue;
auto animation = GH.renderHandler().loadAnimation(animationPath);
animation->preload();
auto first = animation->getImage(0, 0);
@ -88,7 +96,7 @@ void BattleObstacleController::obstacleRemoved(const std::vector<ObstacleChanges
// -> if we know how to blit obstacle, let's blit the effect in the same place
Point whereTo = getObstaclePosition(first, obstacle);
//AFAIK, in H3 there is no sound of obstacle removal
owner.stacksController->addNewAnim(new EffectAnimation(owner, AnimationPath::fromJson(obstacle["appearAnimation"]), whereTo, obstacle["position"].Integer(), 0, true));
owner.stacksController->addNewAnim(new EffectAnimation(owner, animationPath, whereTo, obstacle["position"].Integer(), 0, true));
obstacleAnimations.erase(oi.id);
//so when multiple obstacles are removed, they show up one after another