diff --git a/config/spells/other.json b/config/spells/other.json index 17ebe3f86..aede514ca 100644 --- a/config/spells/other.json +++ b/config/spells/other.json @@ -57,7 +57,7 @@ "targetType" : "NO_TARGET", "sounds": { - "cast": "", // no casting sound, only obstacle placement sound + "cast": "" // no casting sound, only obstacle placement sound }, "levels" : { "base":{ diff --git a/lib/ObstacleHandler.h b/lib/ObstacleHandler.h index 17b20102d..8d2b00ac8 100644 --- a/lib/ObstacleHandler.h +++ b/lib/ObstacleHandler.h @@ -61,10 +61,13 @@ public: h & iconIndex; h & identifier; h & animation; - h & appearSound; h & appearAnimation; - h & triggerSound; - h & triggerAnimation; + if (version > 805) + { + h & appearSound; + h & triggerAnimation; + h & triggerSound; + } h & allowedTerrains; h & allowedSpecialBfields; h & isAbsoluteObstacle; diff --git a/lib/serializer/CSerializer.h b/lib/serializer/CSerializer.h index 9b0d14e47..bcfc6fed9 100644 --- a/lib/serializer/CSerializer.h +++ b/lib/serializer/CSerializer.h @@ -14,7 +14,7 @@ VCMI_LIB_NAMESPACE_BEGIN -const ui32 SERIALIZATION_VERSION = 805; +const ui32 SERIALIZATION_VERSION = 806; const ui32 MINIMAL_SERIALIZATION_VERSION = 805; const std::string SAVEGAME_MAGIC = "VCMISVG"; diff --git a/lib/spells/CSpellHandler.h b/lib/spells/CSpellHandler.h index 33ea37257..329c1b816 100644 --- a/lib/spells/CSpellHandler.h +++ b/lib/spells/CSpellHandler.h @@ -85,7 +85,8 @@ public: template <typename Handler> void serialize(Handler & h, const int version) { h & resourceName; - h & effectName; + if (version > 805) + h & effectName; h & verticalPosition; h & pause; }