Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename report_init to announcementst and identify unknown fields #678

Merged
merged 2 commits into from
Nov 23, 2023
Merged

rename report_init to announcementst and identify unknown fields #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f7f53f
some updates related to announcements
ab9rf Nov 21, 2023
97104c5
add correlated changes to `report`
ab9rf Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions df.announcements.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@
<pointer name='unused' comment='needed to fix alignment on 64-bit platforms'/>
</struct-type>

<struct-type type-name='report'
<struct-type type-name='report' original-name='announcementst'
instance-vector='$global.world.status.reports' key-field='id'>
<enum base-type='int16_t' name='type' type-name='announcement_type'
comment='valid only if coordinates are'/>
Expand Down Expand Up @@ -442,8 +442,8 @@
<int32_t name='year'/>
<int32_t name='time'/>

<int32_t name='unk_v40_1' init-value='-1' since='v0.40.01'/>
<int32_t name='unk_v40_2' init-value='-1' since='v0.40.01'/>
<int32_t name='activity_id' init-value='-1' since='v0.40.01'/>
<int32_t name='activity_event_id' init-value='-1' since='v0.40.01'/>
<int32_t name='speaker_id' ref-target='unit' since='v0.40.01' comment='unit speaking the conversation'/>
</struct-type>

Expand All @@ -460,7 +460,7 @@
<bool name='bright' init-value='true'/>
</struct-type>

<struct-type type-name='report_init' comment='allocated on the stack, included in df-structures to assist with disassembly'>
<struct-type type-name='announcement_infost' comment='allocated on the stack, included in df-structures to assist with disassembly'>
<enum base-type='int16_t' type-name='announcement_type' name='type'/>
<int16_t name='color'/>
<bool name='bright'/>
Expand All @@ -469,10 +469,10 @@
<compound type-name='coord' name='pos2'/>
<enum base-type='int32_t' type-name='report_zoom_type' name='zoom_type2'/>
<int16_t name='display_timer' init-value='2000' comment='graphical frames for announcement bar to linger on last line with no new announcement'/>
<pointer type-name='unit' name='unit1'/>
<pointer type-name='unit' name='unit2'/>
<int32_t name='unk_v40_1' init-value='-1' comment='same as unknown field in report'/>
<int32_t name='unk_v40_2' init-value='-1' comment='same as unknown field in report'/>
<pointer type-name='unit' name='unit_a'/>
<pointer type-name='unit' name='unit_d'/>
<int32_t name='activity_id' init-value='-1' comment='same as unknown field in report'/>
<int32_t name='activity_event_id' init-value='-1' comment='same as unknown field in report'/>
<int32_t name='speaker_id' ref-target='unit'/>
<bitfield base-type='uint8_t' name='flags'>
<flag-bit name='hostile_combat' comment='hunting or combat report, not sparring'/>
Expand Down
8 changes: 4 additions & 4 deletions df.world.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,12 +1050,12 @@

-- Reports and announcements

<compound name='status'>
<compound name='status'> announcement_handlerst
dtor 85356e0
<stl-vector name='reports' pointer-type='report'/>
<stl-vector name='announcements' pointer-type='report'/>
<stl-vector name='popups' pointer-type='popup_message'/>
<compound name='unk_v50_1' type-name='markup_text_boxst'/>
<compound name='mega_text' type-name='markup_text_boxst'/>

<int32_t name='next_report_id'/>
<bitfield name='flags'>
Expand All @@ -1068,8 +1068,8 @@
<stl-vector name='mission_reports' pointer-type='mission_report'/>
<stl-vector name='spoils_reports' pointer-type='spoils_report' since='v0.44.06'/>
<stl-vector name='interrogation_reports' pointer-type='interrogation_report' since='v0.47.01'/>
<stl-vector name='unk_v50_2'/>
<stl-vector name='unk_v50_3'/>
<stl-vector name='announcement_alert'/>
<stl-vector name='alert_button_announcement_id'/>
<int32_t name='display_timer'/>

<compound name='slots'>
Expand Down
Loading