Skip to content

Commit e84c868

Browse files
committed
Initialize pool_id values to -1
to avoid potential mishaps with DF's pooled object manager
1 parent 82e62e9 commit e84c868

8 files changed

Lines changed: 8 additions & 8 deletions

df.announcement.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<int32_t name='activity_event_id' ref-target='activity_event' since='v0.40.01'/>
6767
<int32_t name='speaker_id' original-name='speaker_unid' ref-target='unit' since='v0.40.01' comment='unit speaking the conversation'/>
6868

69-
<size_t name='pool_id'/>
69+
<size_t name='pool_id' init-value='-1'/>
7070
</struct-type>
7171

7272
<struct-type type-name='popup_message' original-name='mega_announcementst'>

df.army.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292

9393
<stl-vector pointer-type='item' name='items' original-name='item' since='v0.44.07'/>
9494

95-
<size_t name='pool_id'/>
95+
<size_t name='pool_id' init-value='-1'/>
9696
</struct-type>
9797

9898
<struct-type type-name='army_handlerst'>

df.army_controller.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@
484484
</compound>
485485
<enum type-name='army_controller_goal_type' name='goal'/>
486486

487-
<size_t name='pool_id'/>
487+
<size_t name='pool_id' init-value='-1'/>
488488
</struct-type>
489489

490490
<struct-type type-name='army_controller_handlerst'>

df.block.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
<compound type-name='coord' name='map_pos' original-name='start'/>
250250
<compound type-name='coord2d' name='region_pos' original-name='a'/>
251251

252-
<size_t name='pool_id'/>
252+
<size_t name='pool_id' init-value='-1'/>
253253

254254
<static-array name='tiletype' original-name='map_tile' count='16'>
255255
<static-array count='16'>

df.entity.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,7 @@
18111811

18121812
<int32_t name='temporary_count'/>
18131813
-- protected --
1814-
<size_t name='pool_id'/>
1814+
<size_t name='pool_id' init-value='-1'/>
18151815
</struct-type>
18161816

18171817
<struct-type type-name='entity_handlerst'>

df.history_figure.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@
10831083
<int32_t name='gen_material_skill_ip_sum' init-value='-1' since='v0.40.17-19'/>
10841084
<int32_t name='defensive_skill_ip_sum' init-value='-1'/>
10851085
-- protected --
1086-
<size_t name='pool_id'/>
1086+
<size_t name='pool_id' init-value='-1'/>
10871087
</struct-type>
10881088
</data-definition>
10891089

df.nemesis.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
<df-flagarray name='flags' original-name='flag' index-enum='nemesis_flags'/>
4949

50-
<size_t name='pool_id'/>
50+
<size_t name='pool_id' init-value='-1'/>
5151
</struct-type>
5252

5353
<struct-type type-name='nemesis_handlerst'>

df.unit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3136,7 +3136,7 @@
31363136
<enum type-name='dungeon_control_state' name='dungeon_control'/>
31373137

31383138
protected:
3139-
<size_t name='pool_id'/>
3139+
<size_t name='pool_id' init-value='-1'/>
31403140
<stl-mutex name='mtx'/>
31413141

31423142
<virtual-methods>

0 commit comments

Comments
 (0)