Fixed a TypeError when calling Player/WeaponMixin._obj() directly rat… · srpg/Source.Python@5ca16aa · GitHub

1. srpg
2. Source.Python

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 5ca16aa

Browse filesBrowse the repository at this point in the historyBrowse files

jordanbriere

committed

Fixed a TypeError when calling Player/WeaponMixin._obj() directly rather than from a subclass.

1 parent 636ebe8 commit 5ca16aa
Copy full SHA for 5ca16aa

2 files changed

-10Lines changed: 0 additions & 10 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/core/modules
  • players
    • players_entity.cpp
  • weapons
    • weapons_entity.cpp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/core/modules/players/players_entity.cpp‎

Copy file name to clipboardExpand all lines: src/core/modules/players/players_entity.cpp

-5Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -53,11 +53,6 @@ boost::shared_ptr<PlayerMixin> PlayerMixin::wrap(CBaseEntity* pEntity)
53	53
54	54	object PlayerMixin::_obj(object cls, CPointer *pPtr)
55	55	{
56		- static PyTypeObject *type = converter::registry::query(typeid(PlayerMixin))->m_class_object;
57		-
58		- if (type == downcast<PyTypeObject>(cls.ptr()))
59		- return object(__init__(ExcIndexFromPointer(pPtr)));
60		-
61	56	return cls(object(ExcIndexFromPointer(pPtr)));
62	57	}
63	58

Collapse file

‎src/core/modules/weapons/weapons_entity.cpp‎

Copy file name to clipboardExpand all lines: src/core/modules/weapons/weapons_entity.cpp

-5Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -55,11 +55,6 @@ boost::shared_ptr<WeaponMixin> WeaponMixin::wrap(CBaseEntity* pEntity)
55	55
56	56	object WeaponMixin::_obj(object cls, CPointer *pPtr)
57	57	{
58		- static PyTypeObject *type = converter::registry::query(typeid(WeaponMixin))->m_class_object;
59		-
60		- if (type == downcast<PyTypeObject>(cls.ptr()))
61		- return object(__init__(ExcIndexFromPointer(pPtr)));
62		-
63	58	return cls(object(ExcIndexFromPointer(pPtr)));
64	59	}
65	60

0 commit comments

Comments

0 (0)