Skip to content

Commit

Permalink
Fix invalid pure virtual function declaration
Browse files Browse the repository at this point in the history
  • Loading branch information
Zegeri committed Sep 16, 2018
1 parent 5836b65 commit 8506cbc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions src/xrGame/attachable_item.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ bool CAttachableItem::can_be_attached() const

return (true);
}

void CAttachableItem::afterAttach()
{
VERIFY(m_valid);
Expand All @@ -124,6 +125,11 @@ void CAttachableItem::afterDetach()
object().processing_deactivate();
}

virtual bool CAttachableItem::use_parent_ai_locations() const
{
return !enabled();
}

#ifdef DEBUG
float ATT_ITEM_MOVE_CURR = 0.01f;
float ATT_ITEM_ROT_CURR = 0.1f;
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/attachable_item.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class CAttachableItem
virtual void enable(bool value);

protected:
virtual bool use_parent_ai_locations() const = 0 { return !enabled(); }
virtual bool use_parent_ai_locations() const = 0;
public:
#ifdef DEBUG
static CAttachableItem* m_dbgItem;
Expand Down

0 comments on commit 8506cbc

Please sign in to comment.