Skip to content

Commit 145f317

Browse files
authored
Merge pull request #861 from quietust/53.03
Update structures for 53.03
2 parents 1bc08a8 + 58fdeb6 commit 145f317

6 files changed

Lines changed: 9 additions & 2 deletions

File tree

df.building.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,6 +1660,7 @@
16601660
<class-type type-name='building_tradedepotst' inherits-from='building_actual'>
16611661
<bitfield name='trade_flags' base-type='uint32_t' type-name='building_tradedepot_flag'/>
16621662
<int32_t name='times_used'/>
1663+
<int32_t name='times_wagon_completed_dropoff'/>
16631664
<bool name='accessible'/>
16641665
</class-type>
16651666

df.d_init.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<struct-type type-name='d_init_displayst'>
3434
<df-flagarray name='flags' index-enum='d_init_flags1'/>
3535

36-
<static-array name='nickname' count='10' index-enum='game_type'><enum type-name='d_init_nickname'/></static-array>
36+
<static-array name='nickname' count='11' index-enum='game_type'><enum type-name='d_init_nickname'/></static-array>
3737

3838
<uint8_t name='sky_tile'/>
3939
<static-array name='sky_color' type-name='int16_t' count='3'/>

df.d_interface.xml

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

65316531
<class-type type-name='viewscreen_choose_game_typest' inherits-from='viewscreen'>
65326532
<stl-vector type-name="game_type" name="gametypes"/>
6533-
<static-array name='game_type_box' index-enum='game_type' count='10' type-name='curses_text_boxst'/>
6533+
<static-array name='game_type_box' index-enum='game_type' count='11' type-name='curses_text_boxst'/>
65346534
</class-type>
65356535

65366536
<enum-type type-name='choose_start_site_view_mode'> bay12: ChooseStartSiteViewMode, no base type!

df.g_src.basics.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<enum-item name='DWARF_TUTORIAL'/>
1818
<enum-item name='DWARF_UNRETIRE'/>
1919
<enum-item name='ADVENTURE_WORLD_DEBUG'/>
20+
<enum-item name='DWARF_TESTING'/>
2021
<enum-item name='num'/>
2122
<enum-item name='NONE'/> not -1
2223
</enum-type>

df.unit.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3076,6 +3076,7 @@
30763076
<ret-type> <pointer type-name='nemesis_record'/> </ret-type>
30773077
<int8_t name='important'/>
30783078
<int8_t name='inplay'/>
3079+
<bool name='just_born'/>
30793080
</vmethod>
30803081
</virtual-methods>
30813082
</class-type>

df.world.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,10 @@
198198
<stl-vector name='level' pointer-type='arena_profile_levelst'/>
199199
</struct-type>
200200

201+
-- Skipped: ArenaTestType
202+
-- Skipped: TestStateType
203+
-- Skipped: testing_arenast
204+
201205
<bitfield-type type-name='arena_flag' base-type='uint32_t'> bay12: ARENA_FLAG_*
202206
<flag-bit name='morale_enable'/>
203207
</bitfield-type>

0 commit comments

Comments
 (0)