Correct init of reserve armored array

ottml · ottml · commit 0604c8514e56 · 2025-06-20T00:23:17.000+02:00
diff --git a/libs/s25main/buildings/nobBaseWarehouse.cpp b/libs/s25main/buildings/nobBaseWarehouse.cpp
@@ -172,13 +172,13 @@ nobBaseWarehouse::nobBaseWarehouse(SerializedGameData& sgd, const unsigned obj_i
     empty_event = sgd.PopEvent();
     store_event = sgd.PopEvent();
 
+    reserve_soldiers_available_with_armor.fill(0);
     for(unsigned i = 0; i < 5; ++i)
     {
         reserve_soldiers_available[i] = sgd.PopUnsignedInt();
         if(sgd.GetGameDataVersion() >= 12)
-        {
             reserve_soldiers_available_with_armor[i] = sgd.PopUnsignedInt();
-        }
+
         reserve_soldiers_claimed_visual[i] = reserve_soldiers_claimed_real[i] = sgd.PopUnsignedInt();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -172,13 +172,13 @@ nobBaseWarehouse::nobBaseWarehouse(SerializedGameData& sgd, const unsigned obj_i`
`172`	`172`	`empty_event = sgd.PopEvent();`
`173`	`173`	`store_event = sgd.PopEvent();`
`174`	`174`
	`175`	`+ reserve_soldiers_available_with_armor.fill(0);`
`175`	`176`	`for(unsigned i = 0; i < 5; ++i)`
`176`	`177`	`{`
`177`	`178`	`reserve_soldiers_available[i] = sgd.PopUnsignedInt();`
`178`	`179`	`if(sgd.GetGameDataVersion() >= 12)`
`179`		`- {`
`180`	`180`	`reserve_soldiers_available_with_armor[i] = sgd.PopUnsignedInt();`
`181`		`- }`
	`181`	`+`
`182`	`182`	`reserve_soldiers_claimed_visual[i] = reserve_soldiers_claimed_real[i] = sgd.PopUnsignedInt();`
`183`	`183`	`}`
`184`	`184`