Skip to content

Commit

Permalink
Какое то сетевой хлам GetKillMsg
Browse files Browse the repository at this point in the history
  • Loading branch information
joye-ramone authored and xrSimpodin committed Mar 5, 2023
1 parent 1de542c commit 0351dd5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
8 changes: 0 additions & 8 deletions ogsr_engine/xrGame/inventory_item.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -587,14 +587,6 @@ bool CInventoryItem::CanTrade() const
return (res && m_flags.test(FCanTrade) && !IsQuestItem());
}

float CInventoryItem::GetKillMsgXPos() const { return READ_IF_EXISTS(pSettings, r_float, m_object->cNameSect(), "kill_msg_x", 0.0f); }

float CInventoryItem::GetKillMsgYPos() const { return READ_IF_EXISTS(pSettings, r_float, m_object->cNameSect(), "kill_msg_y", 0.0f); }

float CInventoryItem::GetKillMsgWidth() const { return READ_IF_EXISTS(pSettings, r_float, m_object->cNameSect(), "kill_msg_width", 0.0f); }

float CInventoryItem::GetKillMsgHeight() const { return READ_IF_EXISTS(pSettings, r_float, m_object->cNameSect(), "kill_msg_height", 0.0f); }

int CInventoryItem::GetGridWidth() const { return (int)m_icon_params.grid_width; }

int CInventoryItem::GetGridHeight() const { return (int)m_icon_params.grid_height; }
Expand Down
9 changes: 3 additions & 6 deletions ogsr_engine/xrGame/inventory_item.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,12 @@ class CInventoryItem : public CAttachableItem,
int GetYPos() const;

bool GetInvShowCondition() const;
//---------------------------------------------------------------------
float GetKillMsgXPos() const;
float GetKillMsgYPos() const;
float GetKillMsgWidth() const;
float GetKillMsgHeight() const;
//---------------------------------------------------------------------

float GetCondition() const { return m_fCondition; }
virtual float GetConditionToShow() const { return GetCondition(); }

void ChangeCondition(float fDeltaCondition);

virtual void SetCondition(float fNewCondition)
{
m_fCondition = fNewCondition;
Expand Down

0 comments on commit 0351dd5

Please sign in to comment.