Skip to content

Правки и фитчи диалогов и худа #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Graff46 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Правки и фитчи диалогов и худа #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ae696c
No crash if not finded phrase in dialogs
Graff46 Jan 24, 2023
197e94f
Added the ability to scale static_wpn_icon on hud
Graff46 Jan 24, 2023
2dacdfc
Apply force to weapons when loading
Graff46 Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ogsr_engine/xrGame/PhraseDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ bool CPhraseDialog::SayPhrase(DIALOG_SHARED_PTR& phrase_dialog, const shared_str
}
}

R_ASSERT2(!phrase_dialog->m_PhraseVector.empty(), make_string("No available phrase to say, dialog[%s]", *phrase_dialog->m_DialogId));
if (phrase_dialog->m_PhraseVector.empty())
return !(phrase_dialog->m_bFinished = true);

//упорядочить списко по убыванию благосклонности
std::sort(phrase_dialog->m_PhraseVector.begin(), phrase_dialog->m_PhraseVector.end(), PhraseGoodwillPred);
Expand Down
6 changes: 6 additions & 0 deletions ogsr_engine/xrGame/Weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,12 @@ BOOL CWeapon::net_Spawn(CSE_Abstract* DC)

VERIFY((u32)iAmmoElapsed == m_magazine.size());

if (m_pPhysicsShell)
{
float frc = 5.f * EffectiveGravity() * m_pPhysicsShell->getMass();
m_pPhysicsShell->applyForce(frc, frc*0.5, 0.f);
}

return bResult;
}

Expand Down
5 changes: 3 additions & 2 deletions ogsr_engine/xrGame/ui/UIMainIngameWnd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ void CUIMainIngameWnd::Init()

UIWeaponBack.AttachChild(&UIWeaponIcon);
xml_init.InitStatic(uiXml, "static_wpn_icon", 0, &UIWeaponIcon);
static_wpn_icon_scale = uiXml.ReadAttribFlt("static_wpn_icon", 0, "scale", 1.0);
UIWeaponIcon.SetShader(GetEquipmentIconsShader());
UIWeaponIcon_rect = UIWeaponIcon.GetWndRect();
//---------------------------------------------------------
Expand Down Expand Up @@ -321,8 +322,8 @@ void CUIMainIngameWnd::SetAmmoIcon(const shared_str& sect_name)

float iGridWidth = icon_params.grid_width;

float w = std::clamp(iGridWidth, 1.f, 2.f) * INV_GRID_WIDTH;
float h = INV_GRID_HEIGHT;
float w = std::clamp(iGridWidth, 1.f, 2.f) * INV_GRID_WIDTH * static_wpn_icon_scale;
float h = INV_GRID_HEIGHT * static_wpn_icon_scale;
w *= UI()->get_current_kx();

float x = UIWeaponIcon_rect.x1;
Expand Down
2 changes: 2 additions & 0 deletions ogsr_engine/xrGame/ui/UIMainIngameWnd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ class CUIMainIngameWnd : public CUIWindow
// Отображение подсказок при наведении прицела на объект
void RenderQuickInfos();

float static_wpn_icon_scale = 1.f;

public:
CUICarPanel& CarPanel() { return UICarPanel; };
CUIMotionIcon& MotionIcon() { return UIMotionIcon; }
Expand Down