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

Jump to bottom

A few updates #619

Merged
merged 1 commit into from
Jul 15, 2023
Merged

A few updates #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ that repo.
# Future

## Structures
- ``build_req_choicest``: realign structure and fix vmethods
- ``squad_orderst``: fix vmethods

# 50.09-r1

Expand Down
3 changes: 2 additions & 1 deletion df.military.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@
<vmethod name='offsetPosition'>
<int16_t name='x'/> <int16_t name='y'/> <int16_t name='z'/>
</vmethod>
<vmethod ret-type='bool' name='process'>
<vmethod name='process'>
<int32_t/> <int32_t/> <pointer name='soldier' type-name='unit'/>
</vmethod>
<vmethod ret-type='squad_order_cannot_reason' name='reasonCannot'>
Expand All @@ -296,6 +296,7 @@
<vmethod name='getDescription'> <pointer type-name='stl-string'/> </vmethod>
<vmethod name='isInactive' ret-type='bool' comment='always false'> <int32_t/> </vmethod>
<vmethod name='isCombat' ret-type='bool' comment='not train'/>
<vmethod name='isEqual' ret-type='bool'><pointer name='other' type-name='squad_order'/></vmethod>
</virtual-methods>
</class-type>

Expand Down
10 changes: 7 additions & 3 deletions df.ui-menus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@
<class-type type-name='build_req_choicest'>
<comment>One choice in the build item selector.</comment>
<int32_t name="distance"/>
<bool/>
<stl-string/>

<virtual-methods>
<vmethod is-destructor='true'/>
<vmethod ret-type='build_req_choice_type' name='getType'/>
<vmethod name='getName'>
<pointer type-name='stl-string' name='str'/>
Expand All @@ -41,8 +44,9 @@
<vmethod ret-type='int32_t' name='getUsedCount'/>
<vmethod ret-type='int32_t' name='getNumCandidates'/>
<vmethod ret-type='bool'/>
<vmethod/>
<vmethod/>
<vmethod ret-type='bool' comment='get_unk1'/>
<vmethod comment='set_unk1'/>
<vmethod comment='clear_unk1'/>
</virtual-methods>
</class-type>

Expand All @@ -52,7 +56,6 @@

<int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
<int32_t name='mat_index'/>
<stl-string/>

<stl-vector name="candidates">
<int32_t>
Expand All @@ -65,6 +68,7 @@
</stl-vector>

<int32_t name="used_count"/>
<bool name='unk_1'/>
</class-type>

<class-type type-name='build_req_choice_specst' inherits-from='build_req_choicest'>
Expand Down
Loading