Skip to content

Commit 6ba3e68

Browse files
committed
Fixed crash in MP with mp_buy_menu_16.xml
Maybe there was symbol that breaks parsing? Anyway, I just deleted commented part of the file..
1 parent 9772aba commit 6ba3e68

File tree

2 files changed

+2
-145
lines changed

2 files changed

+2
-145
lines changed

res/gamedata/configs/ui/mp_buy_menu.xml

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

141141
<lst_medkit x="480" y="189" width="86" height="43"
142142
cell_width="43" cell_height="43" rows_num="1" cols_num="2"
143-
custom_placement="0" group_similar="1"/>`
143+
custom_placement="0" group_similar="1"/>
144144

145145
<lst_granade x="480" y="232" width="86" height="86"
146146
cell_width="43" cell_height="43" rows_num="2" cols_num="2"

res/gamedata/configs/ui/mp_buy_menu_16.xml

Lines changed: 1 addition & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138

139139
<lst_medkit x="383" y="189" width="69" height="43"
140140
cell_width="34" cell_height="43" rows_num="1" cols_num="2"
141-
custom_placement="0" group_similar="1"/>`
141+
custom_placement="0" group_similar="1"/>
142142

143143
<lst_granade x="383" y="232" width="69" height="86"
144144
cell_width="34" cell_height="43" rows_num="2" cols_num="2"
@@ -155,146 +155,3 @@
155155

156156
#include "ui\mp_buy_menu_buttons.xml"
157157
</w>
158-
159-
<!--
160-
<w>
161-
<items_hierarchy>
162-
<level name="root" btn_ref ="">
163-
<level name = "pistols" btn_ref="btn_tab_pistols" />
164-
165-
<level name = "primary_weapons" btn_ref="btn_tab_primary">
166-
<level name="shotgun" btn_ref="btn_bag_shotgun" horz_al="0"/>
167-
168-
<level name="assault" btn_ref="btn_bag_assault" horz_al="0"/>
169-
170-
<level name="sniper_rifles" btn_ref="btn_bag_sniper" horz_al="0"/>
171-
172-
<level name="heavy_weapons" btn_ref="btn_bag_heavy" horz_al="0"/>
173-
</level>
174-
175-
<level name = "granades" btn_ref="btn_tab_granades" horz_al="1"/>
176-
177-
<level name = "outfits" btn_ref="btn_tab_outfits" horz_al="1"/>
178-
179-
<level name = "equipment" btn_ref="btn_tab_equipment" horz_al="1"/>
180-
</level>
181-
</items_hierarchy>
182-
183-
<main x="0" y="0" width="1024" height="768">
184-
<auto_static x="170" y="0" width="854" height="768" stretch="1">
185-
<texture>ui_bm_back</texture>
186-
</auto_static>
187-
188-
<auto_static x="920" y="4" width="99" height="64" stretch="1">
189-
<texture>ui_hud_frame_money</texture>
190-
</auto_static>
191-
192-
<auto_static x="870" y="4" width="50" height="65" stretch="1">
193-
<texture>ui_hud_frame_rank</texture>
194-
</auto_static>
195-
196-
</main>
197-
198-
<item_color_restr_rank r="128" g="0" b="0" a="128"/>
199-
<item_color_restr_money r="255" g="255" b="0" a="128"/>
200-
<item_color_normal r="255" g="255" b="255" a="255"/>
201-
202-
<money_color_positive r="135" g="123" b="116" a="255"/>
203-
<money_color_negative r="255" g="0" b="0" a="255"/>
204-
205-
<static_player_money x="914" y="26" width="112" height="34">
206-
<text font="graffiti32" r="231" g="153" b="22" align="c"/>
207-
</static_player_money>
208-
209-
<static_diff_money x="914" y="65" width="112" height="34">
210-
<text font="graffiti32" color="ui_green" align="c" vert_align="c"/>
211-
</static_diff_money>
212-
213-
<static_curr_items_money x="784" y="10" width="73" height="34">
214-
<text font="graffiti22" color="ui_8" vert_align="c" align="c"/>
215-
</static_curr_items_money>
216-
217-
<static_preset_money_last x="903" y="476" width="61" height="27">
218-
<text font="graffiti22" color="ui_5" align="c" vert_align="c"/>
219-
</static_preset_money_last>
220-
221-
<static_preset_money_1 x="903" y="207" width="61" height="27">
222-
<text font="graffiti22" color="ui_5" align="c" vert_align="c"/>
223-
</static_preset_money_1>
224-
225-
<static_preset_money_2 x="903" y="295" width="61" height="27">
226-
<text font="graffiti22" color="ui_5" align="c" vert_align="c"/>
227-
</static_preset_money_2>
228-
229-
<static_preset_money_3 x="903" y="386" width="61" height="27">
230-
<text font="graffiti22" color="ui_5" align="c" vert_align="c"/>
231-
</static_preset_money_3>
232-
233-
<static_preset_money_def x="903" y="566" width="61" height="27">
234-
<text font="graffiti22" color="ui_5" align="c" vert_align="c"/>
235-
</static_preset_money_def>
236-
237-
<static_player_rank x="876" y="19" width="38" height="47" stretch="1"/>
238-
239-
<static_item_rank x="420" y="610" width="37" height="44" stretch="1"/>
240-
241-
<static_info x="170" y="730" width="629" height="34" light_anim="buy_menu_info" la_cyclic="0" la_texture="0" la_alpha="1">
242-
<text font="letterica18" align="c" vert_align="c"/>
243-
</static_info>
244-
245-
<static_money_change x="914" y="71" width="100" height="34" light_anim="buy_menu_info" la_cyclic="0" la_texture="0" la_alpha="1">
246-
<text font="letterica18" r="231" g="153" b="22" align="c" vert_align="c"/>
247-
</static_money_change>
248-
249-
<shop_wnd x="224" y="0" width="250" height="570" stretch="1"/>
250-
251-
<lst_player_bag x="495" y="358" width="375" height="170"
252-
cell_width = "36" cell_height="43" rows_num="5" cols_num="10"
253-
unlimited="1" group_similar="1"/>
254-
255-
<lst_shop x="4" y="43" width="232" height="518"
256-
cell_width = "36" cell_height="43" rows_num="10" cols_num="6"
257-
unlimited="1" group_similar="1" custom_placement="0"/>
258-
259-
260-
<lst_pistol x="505" y="44" width="105" height="86"
261-
cell_width = "36" cell_height="43" rows_num="2" cols_num="3"
262-
custom_placement="0"/>
263-
264-
<lst_pistol_ammo x="505" y="135" width="108" height="43"
265-
cell_width = "36" cell_height="43" rows_num="1" cols_num="4"
266-
custom_placement="0" group_similar="1"/>
267-
268-
269-
<lst_rifle x="628" y="44" width="217" height="86"
270-
cell_width = "36" cell_height="43" rows_num="2" cols_num="6"
271-
custom_placement="0"/>
272-
273-
<lst_rifle_ammo x="628" y="135" width="217" height="43"
274-
cell_width = "36" cell_height="43" rows_num="1" cols_num="6"
275-
custom_placement="0" group_similar="1"/>
276-
277-
<lst_outfit x="505" y="190" width="72" height="130"
278-
cell_width = "36" cell_height="43" rows_num="3" cols_num="2"
279-
custom_placement="0"/>
280-
281-
<lst_medkit x="584" y="188" width="72" height="43"
282-
cell_width = "36" cell_height="43" rows_num="1" cols_num="2"
283-
custom_placement="0" group_similar="1"/>`
284-
285-
<lst_granade x="584" y="235" width="72" height="86"
286-
cell_width = "36" cell_height="43" rows_num="2" cols_num="2"
287-
custom_placement="0" group_similar="1"/>
288-
289-
<lst_others x="664" y="190" width="179" height="130"
290-
cell_width = "36" cell_height="43" rows_num="3" cols_num="5"
291-
group_similar="1"/>
292-
293-
294-
<tab_control x="170" y="0" width="54" height="565" stretch="1">
295-
<window_name>tab_control</window_name>
296-
</tab_control>
297-
298-
#include "ui\mp_buy_menu_buttons.xml"
299-
</w>
300-
-->

0 commit comments

Comments
 (0)