Skip to content

Commit b7f074f

Browse files
xrSimpodinxrSimpodin
committed
Вынес в настройки клавиши скрытия/показа худа
1 parent cc631af commit b7f074f

File tree

7 files changed

+42
-64
lines changed

7 files changed

+42
-64
lines changed

‎Game/Resources_SoC_1.0006/gamedata/config/text/eng/ui_st_other.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,13 @@
236236
<text>Third person view (freelook)</text>
237237
</string>
238238

239+
<string id="kb_hide_hud">
240+
<text>Hide HUD</text>
241+
</string>
242+
<string id="kb_show_hud">
243+
<text>Show HUD</text>
244+
</string>
245+
239246
<string id="inventory_item_use_or_drag">
240247
<text>Pick up item ($$ACTION_USE$$)\nDrag item (SHIFT+$$ACTION_USE$$)</text>
241248
</string>

‎Game/Resources_SoC_1.0006/gamedata/config/text/rus/ui_st_other.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,13 @@
236236
<text>Âèä îò òðåòüåãî ëèöà (freelook)</text>
237237
</string>
238238

239+
<string id="kb_hide_hud">
240+
<text>Ñêðûòü HUD</text>
241+
</string>
242+
<string id="kb_show_hud">
243+
<text>Ïîêàçàòü HUD</text>
244+
</string>
245+
239246
<string id="inventory_item_use_or_drag">
240247
<text>Ïîäíÿòü ïðåäìåò ($$ACTION_USE$$) \n Ïåðåòàùèòü ïðåäìåò (SHIFT+$$ACTION_USE$$)</text>
241248
</string>

‎Game/Resources_SoC_1.0006/gamedata/config/ui/ui_keybinding.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
<command id="kb_drop" exe="drop"/>
4949
</group>
5050
<group name="kb_grp_common">
51+
<command id="kb_hide_hud" exe="hide_hud"/>
52+
<command id="kb_show_hud" exe="show_hud"/>
5153
<command id="kb_cam_1" exe="cam_1"/>
5254
<command id="kb_cam_2" exe="cam_2"/>
5355
<command id="kb_cam_3" exe="cam_3"/>

‎ogsr_engine/xrGame/ui/UIMainIngameWnd.cpp

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -455,35 +455,24 @@ void CUIMainIngameWnd::Update()
455455

456456
bool CUIMainIngameWnd::OnKeyboardPress(int dik)
457457
{
458-
if (Level().IR_GetKeyState(DIK_LSHIFT) || Level().IR_GetKeyState(DIK_RSHIFT))
458+
const bool shift = Level().IR_GetKeyState(DIK_LSHIFT) || Level().IR_GetKeyState(DIK_RSHIFT);
459+
const auto bind = get_binded_action(dik);
460+
461+
if (bind == kHIDEHUD)
459462
{
460-
switch (dik)
461-
{
462-
case DIK_NUMPADMINUS:
463+
if (shift)
463464
UIZoneMap->ZoomOut();
464-
return true;
465-
break;
466-
case DIK_NUMPADPLUS:
467-
UIZoneMap->ZoomIn();
468-
return true;
469-
break;
470-
}
465+
else
466+
HUD().GetUI()->HideGameIndicators();
467+
return true;
471468
}
472-
else
469+
else if (bind == kSHOWHUD)
473470
{
474-
switch (dik)
475-
{
476-
case DIK_NUMPADMINUS:
477-
//.HideAll();
478-
HUD().GetUI()->HideGameIndicators();
479-
return true;
480-
break;
481-
case DIK_NUMPADPLUS:
482-
//.ShowAll();
471+
if (shift)
472+
UIZoneMap->ZoomIn();
473+
else
483474
HUD().GetUI()->ShowGameIndicators();
484-
return true;
485-
break;
486-
}
475+
return true;
487476
}
488477

489478
return false;

‎ogsr_engine/xrGame/ui/UIMapWnd.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -395,21 +395,21 @@ bool CUIMapWnd::OnKeyboard(int dik, EUIMessages keyboard_action)
395395
if (inherited::OnKeyboard(dik, keyboard_action))
396396
return true;
397397

398-
switch (dik)
398+
const auto bind = get_binded_action(dik);
399+
400+
if (bind == kHIDEHUD)
399401
{
400-
case DIK_NUMPADMINUS: {
401402
SetZoom(GetZoom() / 1.5f);
402403
ResetActionPlanner();
403404
return true;
404405
}
405-
break;
406-
case DIK_NUMPADPLUS: {
406+
else if (bind == kSHOWHUD)
407+
{
407408
SetZoom(GetZoom() * 1.5f);
408409
ResetActionPlanner();
409410
return true;
410411
}
411-
break;
412-
}
412+
413413
return false;
414414
}
415415

‎ogsr_engine/xrGame/xr_level_controller.cpp

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,19 @@ xr_vector<_action> actions = {
2828
"wpn_func", kWPN_FUNC) DEF_ACTION("wpn_firemode_prev", kWPN_FIREMODE_PREV) DEF_ACTION("wpn_firemode_next", kWPN_FIREMODE_NEXT)
2929

3030
DEF_ACTION("pause", kPAUSE) DEF_ACTION("drop", kDROP) DEF_ACTION("use", kUSE) DEF_ACTION("scores", kSCORES)
31-
DEF_ACTION("flashlight", kFLASHLIGHT) DEF_ACTION("chat_team", kCHAT_TEAM) DEF_ACTION("screenshot", kSCREENSHOT)
32-
DEF_ACTION("quit", kQUIT) DEF_ACTION("console", kCONSOLE) DEF_ACTION("inventory", kINVENTORY) DEF_ACTION("buy_menu", kBUY)
33-
DEF_ACTION("skin_menu", kSKIN) DEF_ACTION("team_menu", kTEAM) DEF_ACTION("active_jobs", kACTIVE_JOBS)
31+
DEF_ACTION("flashlight", kFLASHLIGHT) DEF_ACTION("screenshot", kSCREENSHOT)
32+
DEF_ACTION("quit", kQUIT) DEF_ACTION("console", kCONSOLE) DEF_ACTION("inventory", kINVENTORY)
33+
DEF_ACTION("active_jobs", kACTIVE_JOBS)
3434
DEF_ACTION("map", kMAP) DEF_ACTION("contacts", kCONTACTS) DEF_ACTION("ext_1", kEXT_1)
3535

36-
DEF_ACTION("vote_begin", kVOTE_BEGIN) DEF_ACTION("vote", kVOTE) DEF_ACTION("vote_yes", kVOTEYES)
37-
DEF_ACTION("vote_no", kVOTENO)
38-
3936
DEF_ACTION("next_slot", kNEXT_SLOT) DEF_ACTION("prev_slot", kPREV_SLOT)
4037

41-
DEF_ACTION("speech_menu_0", kSPEECH_MENU_0) DEF_ACTION("speech_menu_1", kSPEECH_MENU_1) DEF_ACTION(
42-
"speech_menu_2", kSPEECH_MENU_2) DEF_ACTION("speech_menu_3", kSPEECH_MENU_3)
43-
DEF_ACTION("speech_menu_4", kSPEECH_MENU_4) DEF_ACTION("speech_menu_5", kSPEECH_MENU_5)
44-
DEF_ACTION("speech_menu_6", kSPEECH_MENU_6) DEF_ACTION("speech_menu_7", kSPEECH_MENU_7)
45-
DEF_ACTION("speech_menu_8", kSPEECH_MENU_8) DEF_ACTION("speech_menu_9", kSPEECH_MENU_9)
46-
4738
DEF_ACTION("use_bandage", kUSE_BANDAGE) DEF_ACTION("use_medkit", kUSE_MEDKIT)
4839

4940
DEF_ACTION("quick_save", kQUICK_SAVE) DEF_ACTION("quick_load", kQUICK_LOAD)
5041

51-
DEF_ACTION("artefact", kARTEFACT)};
42+
DEF_ACTION("hide_hud", kHIDEHUD) DEF_ACTION("show_hud", kSHOWHUD)
43+
};
5244

5345
xr_vector<_binding> g_key_bindings;
5446

‎ogsr_engine/xrGame/xr_level_controller.h

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,45 +53,26 @@ enum EGameActions
5353
kUSE,
5454
kSCORES,
5555
kFLASHLIGHT,
56-
kCHAT_TEAM,
5756
kSCREENSHOT,
5857
kQUIT,
5958
kCONSOLE,
6059
kINVENTORY,
61-
kBUY,
62-
kSKIN,
63-
kTEAM,
6460
kACTIVE_JOBS,
6561
kMAP,
6662
kCONTACTS,
6763
kEXT_1,
6864

69-
kVOTE_BEGIN,
70-
kVOTE,
71-
kVOTEYES,
72-
kVOTENO,
73-
7465
kNEXT_SLOT,
7566
kPREV_SLOT,
7667

77-
kSPEECH_MENU_0,
78-
kSPEECH_MENU_1,
79-
kSPEECH_MENU_2,
80-
kSPEECH_MENU_3,
81-
kSPEECH_MENU_4,
82-
kSPEECH_MENU_5,
83-
kSPEECH_MENU_6,
84-
kSPEECH_MENU_7,
85-
kSPEECH_MENU_8,
86-
kSPEECH_MENU_9,
87-
8868
kUSE_BANDAGE,
8969
kUSE_MEDKIT,
9070

9171
kQUICK_SAVE,
9272
kQUICK_LOAD,
9373

94-
kARTEFACT,
74+
kHIDEHUD,
75+
kSHOWHUD,
9576

9677
kLASTACTION = u32(-3),
9778
kNOTBINDED = u32(-2),

0 commit comments

Comments
 (0)