Skip to content

Commit 36117ef

Browse files
committed
Merge branch 'v51.05'
2 parents 272d389 + 9d207f7 commit 36117ef

3 files changed

Lines changed: 3264 additions & 3260 deletions

File tree

df.d_init.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<enum-item name='SHOW_RAMP_ARROWS'/>
1414
<enum-item name='FORT_SHOW_CLOTHING_DYES'/>
1515
<enum-item name='ADV_SHOW_CLOTHING_DYES'/>
16+
<enum-item name='SHOW_RECTANGLE_DIMENSIONS'/>
1617
</enum-type>
1718

1819
<enum-type type-name='d_init_nickname' base-type='int32_t'> bay12: NicknameDisplayType

df.g_src.ViewBase.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,10 @@
146146
</class-type>
147147

148148
<class-type type-name='widget_stack' original-name='widgets::widget_stack' inherits-from='widget_container'>
149-
<bool name='do_pop'/>
149+
<bitfield name='defer_flags' base-type='uint8_t'> bay12: WIDGET_STACK_DEFER_FLAG
150+
<flag-bit name='POP'/>
151+
<flag-bit name='BREAK_DOWN'/>
152+
</bitfield>
150153
<stl-shared-ptr type-name='widget' name='deferred_replacement'/>
151154
</class-type>
152155

0 commit comments

Comments
 (0)