Skip to content

Commit

Permalink
Fixed crash in MP with mp_buy_menu_16.xml
Browse files Browse the repository at this point in the history 
Maybe there was symbol that breaks parsing? Anyway, I just deleted
commented part of the file..
  • Loading branch information
@Xottab-DUTY
Xottab-DUTY committed Jun 17, 2018
1 parent 9772aba commit 6ba3e68
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 145 deletions.
2 changes: 1 addition & 1 deletion res/gamedata/configs/ui/mp_buy_menu.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@

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

<lst_granade x="480" y="232" width="86" height="86"
cell_width="43" cell_height="43" rows_num="2" cols_num="2"
Expand Down
145 changes: 1 addition & 144 deletions res/gamedata/configs/ui/mp_buy_menu_16.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@

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

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

#include "ui\mp_buy_menu_buttons.xml"
</w>

<!--
<w>
<items_hierarchy>
<level name="root" btn_ref ="">
<level name = "pistols" btn_ref="btn_tab_pistols" />
<level name = "primary_weapons" btn_ref="btn_tab_primary">
<level name="shotgun" btn_ref="btn_bag_shotgun" horz_al="0"/>
<level name="assault" btn_ref="btn_bag_assault" horz_al="0"/>
<level name="sniper_rifles" btn_ref="btn_bag_sniper" horz_al="0"/>
<level name="heavy_weapons" btn_ref="btn_bag_heavy" horz_al="0"/>
</level>
<level name = "granades" btn_ref="btn_tab_granades" horz_al="1"/>
<level name = "outfits" btn_ref="btn_tab_outfits" horz_al="1"/>
<level name = "equipment" btn_ref="btn_tab_equipment" horz_al="1"/>
</level>
</items_hierarchy>
<main x="0" y="0" width="1024" height="768">
<auto_static x="170" y="0" width="854" height="768" stretch="1">
<texture>ui_bm_back</texture>
</auto_static>
<auto_static x="920" y="4" width="99" height="64" stretch="1">
<texture>ui_hud_frame_money</texture>
</auto_static>
<auto_static x="870" y="4" width="50" height="65" stretch="1">
<texture>ui_hud_frame_rank</texture>
</auto_static>
</main>
<item_color_restr_rank r="128" g="0" b="0" a="128"/>
<item_color_restr_money r="255" g="255" b="0" a="128"/>
<item_color_normal r="255" g="255" b="255" a="255"/>
<money_color_positive r="135" g="123" b="116" a="255"/>
<money_color_negative r="255" g="0" b="0" a="255"/>
<static_player_money x="914" y="26" width="112" height="34">
<text font="graffiti32" r="231" g="153" b="22" align="c"/>
</static_player_money>
<static_diff_money x="914" y="65" width="112" height="34">
<text font="graffiti32" color="ui_green" align="c" vert_align="c"/>
</static_diff_money>
<static_curr_items_money x="784" y="10" width="73" height="34">
<text font="graffiti22" color="ui_8" vert_align="c" align="c"/>
</static_curr_items_money>
<static_preset_money_last x="903" y="476" width="61" height="27">
<text font="graffiti22" color="ui_5" align="c" vert_align="c"/>
</static_preset_money_last>
<static_preset_money_1 x="903" y="207" width="61" height="27">
<text font="graffiti22" color="ui_5" align="c" vert_align="c"/>
</static_preset_money_1>
<static_preset_money_2 x="903" y="295" width="61" height="27">
<text font="graffiti22" color="ui_5" align="c" vert_align="c"/>
</static_preset_money_2>
<static_preset_money_3 x="903" y="386" width="61" height="27">
<text font="graffiti22" color="ui_5" align="c" vert_align="c"/>
</static_preset_money_3>
<static_preset_money_def x="903" y="566" width="61" height="27">
<text font="graffiti22" color="ui_5" align="c" vert_align="c"/>
</static_preset_money_def>
<static_player_rank x="876" y="19" width="38" height="47" stretch="1"/>
<static_item_rank x="420" y="610" width="37" height="44" stretch="1"/>
<static_info x="170" y="730" width="629" height="34" light_anim="buy_menu_info" la_cyclic="0" la_texture="0" la_alpha="1">
<text font="letterica18" align="c" vert_align="c"/>
</static_info>
<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">
<text font="letterica18" r="231" g="153" b="22" align="c" vert_align="c"/>
</static_money_change>
<shop_wnd x="224" y="0" width="250" height="570" stretch="1"/>
<lst_player_bag x="495" y="358" width="375" height="170"
cell_width = "36" cell_height="43" rows_num="5" cols_num="10"
unlimited="1" group_similar="1"/>
<lst_shop x="4" y="43" width="232" height="518"
cell_width = "36" cell_height="43" rows_num="10" cols_num="6"
unlimited="1" group_similar="1" custom_placement="0"/>
<lst_pistol x="505" y="44" width="105" height="86"
cell_width = "36" cell_height="43" rows_num="2" cols_num="3"
custom_placement="0"/>
<lst_pistol_ammo x="505" y="135" width="108" height="43"
cell_width = "36" cell_height="43" rows_num="1" cols_num="4"
custom_placement="0" group_similar="1"/>
<lst_rifle x="628" y="44" width="217" height="86"
cell_width = "36" cell_height="43" rows_num="2" cols_num="6"
custom_placement="0"/>
<lst_rifle_ammo x="628" y="135" width="217" height="43"
cell_width = "36" cell_height="43" rows_num="1" cols_num="6"
custom_placement="0" group_similar="1"/>
<lst_outfit x="505" y="190" width="72" height="130"
cell_width = "36" cell_height="43" rows_num="3" cols_num="2"
custom_placement="0"/>
<lst_medkit x="584" y="188" width="72" height="43"
cell_width = "36" cell_height="43" rows_num="1" cols_num="2"
custom_placement="0" group_similar="1"/>`
<lst_granade x="584" y="235" width="72" height="86"
cell_width = "36" cell_height="43" rows_num="2" cols_num="2"
custom_placement="0" group_similar="1"/>
<lst_others x="664" y="190" width="179" height="130"
cell_width = "36" cell_height="43" rows_num="3" cols_num="5"
group_similar="1"/>
<tab_control x="170" y="0" width="54" height="565" stretch="1">
<window_name>tab_control</window_name>
</tab_control>
#include "ui\mp_buy_menu_buttons.xml"
</w>
-->

0 comments on commit 6ba3e68

Please sign in to comment.