Moved Entity.lookup_attachment to ServerEntity

Author: Ayuto

addons/source-python/packages/source-python/entities/_base.py

@@ -802,28 +802,6 @@ def call_input(self, name, *args, **kwargs):
         """
         self.get_input(name)(*args, **kwargs)
 
-    def lookup_attachment(self, name):
-        """Return the attachment index matching the given name.
-
-        :param str name:
-            The name of the attachment.
-        :rtype: int
-        """
-        # Get the ModelHeader instance of the entity
-        model_header = self.model_header
-
-        # Loop through all attachments
-        for index in range(model_header.attachments_count):
-
-            # Are the names matching?
-            if name == model_header.get_attachment(index).name:
-
-                # Return the current index
-                return index
-
-        # No attachment found
-        return INVALID_ATTACHMENT_INDEX
-
     def emit_sound(
             self, sample, recipients=(), volume=VOL_NORM,
             attenuation=Attenuation.NONE, channel=Channel.AUTO,

addons/source-python/packages/source-python/studio/constants.py

@@ -15,6 +15,7 @@
 # =============================================================================
 # Source.Python Imports
 #   Studio
+from _studio._constants import INVALID_ATTACHMENT_INDEX
 from _studio._constants import ModelType
 from _studio._constants import STUDIO_NONE
 from _studio._constants import STUDIO_RENDER
@@ -39,12 +40,6 @@
            )
 
 
-# =============================================================================
-# >> GLOBAL VARIABLES
-# =============================================================================
-INVALID_ATTACHMENT_INDEX = -1
-
-
 # =============================================================================
 # >> ENUMERATORS
 # =============================================================================

src/core/modules/entities/entities.cpp

@@ -27,8 +27,12 @@
 // ============================================================================
 // >> INCLUDES
 // ============================================================================
+// SDK
+#include "strtools.h"
+
 // Source.Python
 #include "entities.h"
+#include "../../modules/studio/studio.h"
 
 
 // ============================================================================
@@ -87,4 +91,20 @@ studiohdr_t* ServerEntityExt::get_model_header(IServerEntity *pServerEntity)
 		return NULL;
 
 	return modelcache->GetStudioHdr(handle);
+}
+
+int ServerEntityExt::lookup_attachment(IServerEntity* pEntity, const char* name)
+{
+	studiohdr_t* header = get_model_header(pEntity);
+	if (!header)
+		return INVALID_ATTACHMENT_INDEX;
+
+	for (int i=0; i < header->numlocalattachments; ++i)
+	{
+		mstudioattachment_t* attachment = header->pLocalAttachment(i);
+		if (V_strcmp(attachment->pszName(), name) == 0)
+			return i;
+	}
+
+	return INVALID_ATTACHMENT_INDEX;
 }

src/core/modules/entities/entities.h

@@ -52,6 +52,7 @@ class ServerEntityExt
 	static void SetModelName(IServerEntity *pServerEntity, const char *szModelName);
 	static MDLHandle_t get_model_handle(IServerEntity *pServerEntity);
 	static studiohdr_t* get_model_header(IServerEntity *pServerEntity);
+	static int ServerEntityExt::lookup_attachment(IServerEntity* pEntity, const char* name);
 };
 
 

src/core/modules/entities/entities_wrap.cpp

@@ -224,6 +224,14 @@ void export_server_entity(scope _entities)
 			":rtype: ModelHeader"
 		)
 
+		.def("lookup_attachment",
+			&ServerEntityExt::lookup_attachment,
+			"Return the attachment index matching the given name.\n\n"
+			":param str name:\n"
+			"	The name of the attachment.\n"
+			":rtype: int"
+		)
+
 		ADD_MEM_TOOLS(IServerEntity)
 	;
 }

src/core/modules/studio/studio.h

@@ -43,6 +43,12 @@
 extern IMDLCache *modelcache;
 
 
+//-----------------------------------------------------------------------------
+// DEFINES
+//-----------------------------------------------------------------------------
+#define INVALID_ATTACHMENT_INDEX -1
+
+
 //-----------------------------------------------------------------------------
 // studiohdr_t extension class.
 //-----------------------------------------------------------------------------

src/core/modules/studio/studio_constants_wrap.cpp

@@ -29,7 +29,7 @@
 //-----------------------------------------------------------------------------
 #include "export_main.h"
 #include "model_types.h"
-
+#include "studio.h"
 
 //-----------------------------------------------------------------------------
 // Forward declarations.
@@ -45,6 +45,8 @@ DECLARE_SP_SUBMODULE(_studio, _constants)
 {
 	export_model_type(_constants);
 	export_studio_flags(_constants);
+
+	_constants.attr("INVALID_ATTACHMENT_INDEX") = INVALID_ATTACHMENT_INDEX;
 }