@@ -359,10 +359,6 @@ namespace
359359 auto constexpr Id_GeneratorGenome_MinValue = 4 ;
360360 auto constexpr Id_GeneratorGenome_MaxValue = 5 ;
361361 auto constexpr Id_GeneratorGenome_TimeOffset = 2 ;
362- auto constexpr Id_Generator_Additive = 0 ;
363- auto constexpr Id_Generator_MinValue = 5 ;
364- auto constexpr Id_Generator_MaxValue = 6 ;
365- auto constexpr Id_Generator_TimeOffset = 3 ;
366362
367363 auto constexpr Id_GeneratorModeGenome_SquareSignal_Amplitude = 0 ;
368364 auto constexpr Id_GeneratorModeGenome_SquareSignal_Period = 1 ;
@@ -564,14 +560,12 @@ namespace cereal
564560 void loadSave (SerializationTask task, Archive& ar, GeneratorGenomeDesc& data)
565561 {
566562 GeneratorGenomeDesc defaultObject;
567- {
568- auto scope = getSerializationScope (task, ar);
569- scope.addMember (Id_GeneratorGenome_Additive, data._additive , defaultObject._additive );
570- scope.addMember (Id_GeneratorGenome_MinValue, data._minValue , defaultObject._minValue );
571- scope.addMember (Id_GeneratorGenome_MaxValue, data._maxValue , defaultObject._maxValue );
572- scope.addMember (Id_GeneratorGenome_TimeOffset, data._timeOffset , defaultObject._timeOffset );
573- scope.addDesc (Id_GeneratorGenome_Mode, data._mode );
574- }
563+ auto scope = getSerializationScope (task, ar);
564+ scope.addMember (Id_GeneratorGenome_Additive, data._additive , defaultObject._additive );
565+ scope.addMember (Id_GeneratorGenome_MinValue, data._minValue , defaultObject._minValue );
566+ scope.addMember (Id_GeneratorGenome_MaxValue, data._maxValue , defaultObject._maxValue );
567+ scope.addMember (Id_GeneratorGenome_TimeOffset, data._timeOffset , defaultObject._timeOffset );
568+ scope.addDesc (Id_GeneratorGenome_Mode, data._mode );
575569 }
576570 SPLIT_SERIALIZATION (GeneratorGenomeDesc)
577571
@@ -1029,11 +1023,10 @@ namespace
10291023 auto constexpr Id_Generator_Additive = 0 ;
10301024 auto constexpr Id_Generator_NumPulses = 1 ;
10311025 auto constexpr Id_Generator_TimeOffset = 3 ;
1032-
1033- auto constexpr Id_GeneratorMode_SquareSignal_Amplitude = 0 ;
1026+ auto constexpr Id_Generator_MinValue = 5 ;
1027+ auto constexpr Id_Generator_MaxValue = 6 ;
1028+
10341029 auto constexpr Id_GeneratorMode_SquareSignal_Period = 1 ;
1035-
1036- auto constexpr Id_GeneratorMode_SawtoothSignal_Amplitude = 0 ;
10371030 auto constexpr Id_GeneratorMode_SawtoothSignal_Period = 1 ;
10381031
10391032 auto constexpr Id_AttackerMode_FreeCell_RestrictToColor = 0 ;
@@ -1284,15 +1277,13 @@ namespace cereal
12841277 void loadSave (SerializationTask task, Archive& ar, GeneratorDesc& data)
12851278 {
12861279 GeneratorDesc defaultObject;
1287- {
1288- auto scope = getSerializationScope (task, ar);
1289- scope.addMember (Id_Generator_Additive, data._additive , defaultObject._additive );
1290- scope.addMember (Id_Generator_NumPulses, data._numPulses , defaultObject._numPulses );
1291- scope.addMember (Id_Generator_MinValue, data._minValue , defaultObject._minValue );
1292- scope.addMember (Id_Generator_MaxValue, data._maxValue , defaultObject._maxValue );
1293- scope.addMember (Id_Generator_TimeOffset, data._timeOffset , defaultObject._timeOffset );
1294- scope.addDesc (Id_Generator_Mode, data._mode );
1295- }
1280+ auto scope = getSerializationScope (task, ar);
1281+ scope.addMember (Id_Generator_Additive, data._additive , defaultObject._additive );
1282+ scope.addMember (Id_Generator_NumPulses, data._numPulses , defaultObject._numPulses );
1283+ scope.addMember (Id_Generator_MinValue, data._minValue , defaultObject._minValue );
1284+ scope.addMember (Id_Generator_MaxValue, data._maxValue , defaultObject._maxValue );
1285+ scope.addMember (Id_Generator_TimeOffset, data._timeOffset , defaultObject._timeOffset );
1286+ scope.addDesc (Id_Generator_Mode, data._mode );
12961287 }
12971288 SPLIT_SERIALIZATION (GeneratorDesc)
12981289
0 commit comments