games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Merge branch 'develop' into crash_fix4

Browse Source
This commit is contained in:
kdmcser
2025-05-06 01:20:19 +08:00
committed by GitHub
parent 69b58f1846 fb0cdb2475
commit 5645806035
63 changed files with 777 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/serializer/ESerializationVersion.h
View File

@@ -36,7 +36,10 @@ enum class ESerializationVersion : int32_t
MAP_HEADER_DISPOSED_HEROES, // map header contains disposed heroes list
NO_RAW_POINTERS_IN_SERIALIZER, // large rework that removed all non-owning pointers from serializer
STORE_UID_COUNTER_IN_CMAP, // fix crash caused by conflicting instanceName after loading game
STACK_INSTANCE_EXPERIENCE_FIX, // stack experience is stored as total, not as average
STACK_INSTANCE_ARMY_FIX, // remove serialization of army that owns stack instance
STORE_UID_COUNTER_IN_CMAP, // fix crash caused by conflicting instanceName after loading game
CURRENT = STORE_UID_COUNTER_IN_CMAP,
};

3
lib/serializer/RegisterTypes.h
View File

@@ -226,7 +226,6 @@ void registerTypes(Serializer &s)
s.template registerType<BulkMoveArtifacts>(173);
s.template registerType<PlayerMessageClient>(174);
s.template registerType<BulkRebalanceStacks>(175);
s.template registerType<BulkSmartRebalanceStacks>(176);
s.template registerType<SetRewardableConfiguration>(177);
s.template registerType<CPackForServer>(179);
s.template registerType<EndTurn>(180);
@@ -255,7 +254,7 @@ void registerTypes(Serializer &s)
s.template registerType<PlayerMessage>(203);
s.template registerType<BulkSplitStack>(204);
s.template registerType<BulkMergeStacks>(205);
s.template registerType<BulkSmartSplitStack>(206);
s.template registerType<BulkSplitAndRebalanceStack>(206);
s.template registerType<BulkMoveArmy>(207);
s.template registerType<BulkExchangeArtifacts>(208);
s.template registerType<ManageBackpackArtifacts>(209);