Skip to content

Commit bee92b5

Browse files
authored
Merge pull request #503 from OpenVicProject/province_instance_match_index_type
Match ProvinceIndex index_t with ProvinceDefinition
2 parents 5558502 + 58e9e55 commit bee92b5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/openvic-simulation/map/ProvinceInstance.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ namespace OpenVic {
4646
using ArmyInstance = UnitInstanceGroupBranched<UnitType::branch_t::LAND>;
4747
using NavyInstance = UnitInstanceGroupBranched<UnitType::branch_t::NAVAL>;
4848

49-
struct ProvinceInstance : HasIdentifierAndColour, HasIndex<ProvinceInstance>, FlagStrings {
49+
//HasIndex index_t must match ProvinceDefinition's index_t
50+
struct ProvinceInstance : HasIdentifierAndColour, HasIndex<ProvinceInstance, uint16_t>, FlagStrings {
5051
friend struct MapInstance;
5152

5253
using life_rating_t = int8_t;

0 commit comments

Comments
 (0)