Skip to content

Commit

Permalink
align more structures
Browse files Browse the repository at this point in the history
vectors are probably in the wrong place, but at least they *are* vectors.
  • Loading branch information
BenLubar committed Feb 13, 2020
1 parent d436ebc commit 8367534
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
17 changes: 17 additions & 0 deletions df.history.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2534,6 +2534,7 @@
<compound type-name='language_name' name='name'/>
<stl-vector name='attacker_civ' type-name='int32_t' ref-target='historical_entity'/>
<stl-vector name='defender_civ' type-name='int32_t' ref-target='historical_entity'/>
<stl-vector/>
<compound name='unk'>
<stl-vector type-name='int16_t'/>
<stl-vector type-name='int32_t'/>
Expand Down Expand Up @@ -2567,6 +2568,22 @@
<stl-vector name='defender_hf' type-name='int32_t' ref-target='historical_figure'/>
<stl-vector name='noncombat_hf' type-name='int32_t' ref-target='historical_figure'/>

these new fields are probably mixed in above or below
<stl-vector/>
<int32_t/>
<int32_t/>
<int32_t/>
<int32_t/>
<int32_t/>
<int32_t/>
<int32_t/>
<int32_t init-value='-1'/>
<int32_t init-value='-1'/>
<stl-vector/>
<stl-vector/>
<stl-vector/>
<stl-vector/>

<stl-vector name='attacker_squad_entity_pop' type-name='int32_t'/>
<stl-vector name='attacker_squad_counts' type-name='int32_t'/>
<stl-vector name='attacker_squad_deaths' type-name='int32_t'/>
Expand Down
4 changes: 3 additions & 1 deletion df.interaction.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@
<stl-string name='name'/>
<stl-string name='hist_string_1'/>
<stl-string name='hist_string_2'/>
<stl-string/>
<stl-string/>
<stl-string/>

<virtual-methods>
<vmethod ret-type='interaction_source_type' name='getType'/>
Expand Down Expand Up @@ -204,7 +207,6 @@
</enum-type>

<class-type type-name='interaction_source_deityst' inherits-from='interaction_source'>
<stl-vector/>
<int32_t/>
<stl-vector name='usage_hint' type-name='interaction_source_usage_hint'/>
</class-type>
Expand Down

0 comments on commit 8367534

Please sign in to comment.