Skip to content

Commit

Permalink
Fix conventions.
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavel Kovalenko committed Oct 4, 2014
1 parent 3d82f83 commit 144788e
Show file tree
Hide file tree
Showing 24 changed files with 504 additions and 583 deletions.
2 changes: 1 addition & 1 deletion src/xrGame/ActorInput.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ void CActor::IR_OnKeyboardPress(int cmd)
strconcat (sizeof(str),str,*CStringTable().translate("st_item_used"),": ", itm->NameItem());
_s->wnd()->TextItemControl()->SetText(str);

CurrentGameUI()->ActorMenu().m_pQuickSlot->ReloadReferences(this);
CurrentGameUI()->GetActorMenu().m_pQuickSlot->ReloadReferences(this);
}
}
}break;
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/Actor_Network.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,7 @@ void CActor::save(NET_Packet &output_packet)
inherited::save(output_packet);
CInventoryOwner::save(output_packet);
output_packet.w_u8(u8(m_bOutBorder));
CUITaskWnd* task_wnd = HUD().GetGameUI()->PdaMenu().pUITaskWnd;
CUITaskWnd* task_wnd = HUD().GetGameUI()->GetPdaMenu().pUITaskWnd;
output_packet.w_u8(task_wnd->IsTreasuresEnabled() ? 1 : 0);
output_packet.w_u8(task_wnd->IsQuestNpcsEnabled() ? 1 : 0);
output_packet.w_u8(task_wnd->IsSecondaryTasksEnabled() ? 1 : 0);
Expand All @@ -1361,7 +1361,7 @@ void CActor::load(IReader &input_packet)
inherited::load(input_packet);
CInventoryOwner::load(input_packet);
m_bOutBorder=!!(input_packet.r_u8());
CUITaskWnd* task_wnd = HUD().GetGameUI()->PdaMenu().pUITaskWnd;
CUITaskWnd* task_wnd = HUD().GetGameUI()->GetPdaMenu().pUITaskWnd;
task_wnd->TreasuresEnabled(!!input_packet.r_u8());
task_wnd->QuestNpcsEnabled(!!input_packet.r_u8());
task_wnd->SecondaryTasksEnabled(!!input_packet.r_u8());
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/GamePersistent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ void CGamePersistent::OnEvent(EVENT E, u64 P1, u64 P2)
{
CurrentGameUI()->HideShownDialogs();
CurrentGameUI()->UIMainIngameWnd->reset_ui();
CurrentGameUI()->PdaMenu().Reset();
CurrentGameUI()->GetPdaMenu().Reset();
}

if(g_tutorial)
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/Inventory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ void CInventory::Take(CGameObject *pObj, bool bNotActivate, bool strict_placemen
{
CurrentGameUI()->OnInventoryAction(pIItem, GE_OWNERSHIP_TAKE);
}
else if(CurrentGameUI()->ActorMenu().GetMenuMode()==mmDeadBodySearch)
else if(CurrentGameUI()->GetActorMenu().GetMenuMode()==mmDeadBodySearch)
{
if(m_pOwner==CurrentGameUI()->ActorMenu().GetPartner())
if(m_pOwner==CurrentGameUI()->GetActorMenu().GetPartner())
CurrentGameUI()->OnInventoryAction(pIItem, GE_OWNERSHIP_TAKE);
}
};
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/InventoryBox.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ void CInventoryBox::OnEvent(NET_Packet& P, u16 type)
VERIFY (pIItem);
if( CurrentGameUI() )
{
if(CurrentGameUI()->ActorMenu().GetMenuMode()==mmDeadBodySearch)
if(CurrentGameUI()->GetActorMenu().GetMenuMode()==mmDeadBodySearch)
{
if(this==CurrentGameUI()->ActorMenu().GetInvBox())
if(this==CurrentGameUI()->GetActorMenu().GetInvBox())
CurrentGameUI()->OnInventoryAction(pIItem, GE_OWNERSHIP_TAKE);
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/Level_network.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void CLevel::net_Stop ()
if(CurrentGameUI())
{
CurrentGameUI()->HideShownDialogs();
CurrentGameUI()->PdaMenu().Reset();
CurrentGameUI()->GetPdaMenu().Reset();
}

if(g_tutorial && !g_tutorial->Persistent())
Expand Down
6 changes: 3 additions & 3 deletions src/xrGame/UIGameAHunt.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void CUIGameAHunt::Init (int stage)
if(stage==0)
{ // shared
inherited::Init (stage);
m_buy_msg_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_ah_buy", m_window);
m_buy_msg_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_ah_buy", Window);
}
if(stage==1)
{ //unique
Expand All @@ -34,7 +34,7 @@ void CUIGameAHunt::Init (int stage)
CUIXml uiXml;
uiXml.Load (CONFIG_PATH, UI_PATH, "ui_game_ahunt.xml");

CUIXmlInit::InitWindow (uiXml, "global", 0, m_window);
CUIXmlInit::InitWindow (uiXml, "global", 0, Window);
CUIXmlInit::InitTextWnd (uiXml, "fraglimit",0, m_pFragLimitIndicator);

m_pReinforcementInidcator = xr_new<CUITextWnd>();
Expand All @@ -52,7 +52,7 @@ void CUIGameAHunt::Init (int stage)
if(stage==2)
{ //after
inherited::Init (stage);
m_window->AttachChild (m_pReinforcementInidcator);
Window->AttachChild (m_pReinforcementInidcator);
}
};

Expand Down
30 changes: 15 additions & 15 deletions src/xrGame/UIGameCTA.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ void CUIGameCTA::Init(int stage)
{
if(stage==0)
{
m_round_result_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_round_result", m_window);
m_pressbuy_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_pressbuy", m_window);
m_pressjump_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_pressjump", m_window);
m_spectator_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_spectator", m_window);
m_spectrmode_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_spetatormode", m_window);
m_warm_up_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_warm_up", m_window);
m_time_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_timelimit", m_window);
m_demo_play_caption = UIHelper::CreateTextWnd(*m_msgs_xml, "mp_demo_play", m_window);
m_round_result_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_round_result", Window);
m_pressbuy_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_pressbuy", Window);
m_pressjump_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_pressjump", Window);
m_spectator_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_spectator", Window);
m_spectrmode_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_spetatormode", Window);
m_warm_up_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_warm_up", Window);
m_time_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_timelimit", Window);
m_demo_play_caption = UIHelper::CreateTextWnd(*MsgConfig, "mp_demo_play", Window);

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

CUIXmlInit::InitWindow (uiXml, "global", 0, m_window);
CUIXmlInit::InitWindow (uiXml, "global", 0, Window);

m_pMoneyIndicator = xr_new<CUIMoneyIndicator>();
m_pMoneyIndicator->SetAutoDelete(true);
Expand Down Expand Up @@ -114,12 +114,12 @@ void CUIGameCTA::Init(int stage)
if(stage==2)
{
inherited::Init (stage);
m_window->AttachChild (m_pMoneyIndicator);
m_window->AttachChild (m_pRankIndicator);
m_window->AttachChild (m_pReinforcementInidcator);
m_window->AttachChild (m_pFragLimitIndicator);
m_window->AttachChild (m_team1_score);
m_window->AttachChild (m_team2_score);
Window->AttachChild (m_pMoneyIndicator);
Window->AttachChild (m_pRankIndicator);
Window->AttachChild (m_pReinforcementInidcator);
Window->AttachChild (m_pFragLimitIndicator);
Window->AttachChild (m_team1_score);
Window->AttachChild (m_team2_score);
}
}

Expand Down
Loading

0 comments on commit 144788e

Please sign in to comment.