Skip to content

Commit 144788e

Browse files
author
Pavel Kovalenko
committed
Fix conventions.
1 parent 3d82f83 commit 144788e

24 files changed

+504
-583
lines changed

‎src/xrGame/ActorInput.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void CActor::IR_OnKeyboardPress(int cmd)
184184
strconcat (sizeof(str),str,*CStringTable().translate("st_item_used"),": ", itm->NameItem());
185185
_s->wnd()->TextItemControl()->SetText(str);
186186

187-
CurrentGameUI()->ActorMenu().m_pQuickSlot->ReloadReferences(this);
187+
CurrentGameUI()->GetActorMenu().m_pQuickSlot->ReloadReferences(this);
188188
}
189189
}
190190
}break;

‎src/xrGame/Actor_Network.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,7 +1344,7 @@ void CActor::save(NET_Packet &output_packet)
13441344
inherited::save(output_packet);
13451345
CInventoryOwner::save(output_packet);
13461346
output_packet.w_u8(u8(m_bOutBorder));
1347-
CUITaskWnd* task_wnd = HUD().GetGameUI()->PdaMenu().pUITaskWnd;
1347+
CUITaskWnd* task_wnd = HUD().GetGameUI()->GetPdaMenu().pUITaskWnd;
13481348
output_packet.w_u8(task_wnd->IsTreasuresEnabled() ? 1 : 0);
13491349
output_packet.w_u8(task_wnd->IsQuestNpcsEnabled() ? 1 : 0);
13501350
output_packet.w_u8(task_wnd->IsSecondaryTasksEnabled() ? 1 : 0);
@@ -1361,7 +1361,7 @@ void CActor::load(IReader &input_packet)
13611361
inherited::load(input_packet);
13621362
CInventoryOwner::load(input_packet);
13631363
m_bOutBorder=!!(input_packet.r_u8());
1364-
CUITaskWnd* task_wnd = HUD().GetGameUI()->PdaMenu().pUITaskWnd;
1364+
CUITaskWnd* task_wnd = HUD().GetGameUI()->GetPdaMenu().pUITaskWnd;
13651365
task_wnd->TreasuresEnabled(!!input_packet.r_u8());
13661366
task_wnd->QuestNpcsEnabled(!!input_packet.r_u8());
13671367
task_wnd->SecondaryTasksEnabled(!!input_packet.r_u8());

‎src/xrGame/GamePersistent.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ void CGamePersistent::OnEvent(EVENT E, u64 P1, u64 P2)
706706
{
707707
CurrentGameUI()->HideShownDialogs();
708708
CurrentGameUI()->UIMainIngameWnd->reset_ui();
709-
CurrentGameUI()->PdaMenu().Reset();
709+
CurrentGameUI()->GetPdaMenu().Reset();
710710
}
711711

712712
if(g_tutorial)

‎src/xrGame/Inventory.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ void CInventory::Take(CGameObject *pObj, bool bNotActivate, bool strict_placemen
195195
{
196196
CurrentGameUI()->OnInventoryAction(pIItem, GE_OWNERSHIP_TAKE);
197197
}
198-
else if(CurrentGameUI()->ActorMenu().GetMenuMode()==mmDeadBodySearch)
198+
else if(CurrentGameUI()->GetActorMenu().GetMenuMode()==mmDeadBodySearch)
199199
{
200-
if(m_pOwner==CurrentGameUI()->ActorMenu().GetPartner())
200+
if(m_pOwner==CurrentGameUI()->GetActorMenu().GetPartner())
201201
CurrentGameUI()->OnInventoryAction(pIItem, GE_OWNERSHIP_TAKE);
202202
}
203203
};

‎src/xrGame/InventoryBox.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ void CInventoryBox::OnEvent(NET_Packet& P, u16 type)
4242
VERIFY (pIItem);
4343
if( CurrentGameUI() )
4444
{
45-
if(CurrentGameUI()->ActorMenu().GetMenuMode()==mmDeadBodySearch)
45+
if(CurrentGameUI()->GetActorMenu().GetMenuMode()==mmDeadBodySearch)
4646
{
47-
if(this==CurrentGameUI()->ActorMenu().GetInvBox())
47+
if(this==CurrentGameUI()->GetActorMenu().GetInvBox())
4848
CurrentGameUI()->OnInventoryAction(pIItem, GE_OWNERSHIP_TAKE);
4949
}
5050
};

‎src/xrGame/Level_network.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void CLevel::net_Stop ()
124124
if(CurrentGameUI())
125125
{
126126
CurrentGameUI()->HideShownDialogs();
127-
CurrentGameUI()->PdaMenu().Reset();
127+
CurrentGameUI()->GetPdaMenu().Reset();
128128
}
129129

130130
if(g_tutorial && !g_tutorial->Persistent())

‎src/xrGame/UIGameAHunt.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void CUIGameAHunt::Init (int stage)
2525
if(stage==0)
2626
{ // shared
2727
inherited::Init (stage);
28-
m_buy_msg_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_ah_buy", m_window);
28+
m_buy_msg_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_ah_buy", Window);
2929
}
3030
if(stage==1)
3131
{ //unique
@@ -34,7 +34,7 @@ void CUIGameAHunt::Init (int stage)
3434
CUIXml uiXml;
3535
uiXml.Load (CONFIG_PATH, UI_PATH, "ui_game_ahunt.xml");
3636

37-
CUIXmlInit::InitWindow (uiXml, "global", 0, m_window);
37+
CUIXmlInit::InitWindow (uiXml, "global", 0, Window);
3838
CUIXmlInit::InitTextWnd (uiXml, "fraglimit",0, m_pFragLimitIndicator);
3939

4040
m_pReinforcementInidcator = xr_new<CUITextWnd>();
@@ -52,7 +52,7 @@ void CUIGameAHunt::Init (int stage)
5252
if(stage==2)
5353
{ //after
5454
inherited::Init (stage);
55-
m_window->AttachChild (m_pReinforcementInidcator);
55+
Window->AttachChild (m_pReinforcementInidcator);
5656
}
5757
};
5858

‎src/xrGame/UIGameCTA.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ void CUIGameCTA::Init(int stage)
6464
{
6565
if(stage==0)
6666
{
67-
m_round_result_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_round_result", m_window);
68-
m_pressbuy_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_pressbuy", m_window);
69-
m_pressjump_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_pressjump", m_window);
70-
m_spectator_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_spectator", m_window);
71-
m_spectrmode_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_spetatormode", m_window);
72-
m_warm_up_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_warm_up", m_window);
73-
m_time_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_timelimit", m_window);
74-
m_demo_play_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_demo_play", m_window);
67+
m_round_result_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_round_result", Window);
68+
m_pressbuy_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_pressbuy", Window);
69+
m_pressjump_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_pressjump", Window);
70+
m_spectator_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_spectator", Window);
71+
m_spectrmode_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_spetatormode", Window);
72+
m_warm_up_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_warm_up", Window);
73+
m_time_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_timelimit", Window);
74+
m_demo_play_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_demo_play", Window);
7575

7676
teamPanels = xr_new<UITeamPanels>();
7777
teamPanels->Init (TEAM_PANELS_XML_NAME, "team_panels_wnd");
@@ -80,7 +80,7 @@ void CUIGameCTA::Init(int stage)
8080
CUIXml uiXml;
8181
uiXml.Load (CONFIG_PATH, UI_PATH, CTA_GAME_WND_XML);
8282

83-
CUIXmlInit::InitWindow (uiXml, "global", 0, m_window);
83+
CUIXmlInit::InitWindow (uiXml, "global", 0, Window);
8484

8585
m_pMoneyIndicator = xr_new<CUIMoneyIndicator>();
8686
m_pMoneyIndicator->SetAutoDelete(true);
@@ -114,12 +114,12 @@ void CUIGameCTA::Init(int stage)
114114
if(stage==2)
115115
{
116116
inherited::Init (stage);
117-
m_window->AttachChild (m_pMoneyIndicator);
118-
m_window->AttachChild (m_pRankIndicator);
119-
m_window->AttachChild (m_pReinforcementInidcator);
120-
m_window->AttachChild (m_pFragLimitIndicator);
121-
m_window->AttachChild (m_team1_score);
122-
m_window->AttachChild (m_team2_score);
117+
Window->AttachChild (m_pMoneyIndicator);
118+
Window->AttachChild (m_pRankIndicator);
119+
Window->AttachChild (m_pReinforcementInidcator);
120+
Window->AttachChild (m_pFragLimitIndicator);
121+
Window->AttachChild (m_team1_score);
122+
Window->AttachChild (m_team2_score);
123123
}
124124
}
125125

0 commit comments

Comments
 (0)