Merge branch 'master' of https://github.com/Source-Python-Dev-Team/Source.Python

Author: L'In20Cible

addons/source-python/packages/source-python/commands/typed.py

@@ -34,6 +34,28 @@
 from messages import HudDestination
 
 
+# =============================================================================
+# >> ALL DECLARATION
+# =============================================================================
+__all__ = ('SUPPORTED_KINDS',
+           'ArgumentError',
+           'ArgumentNumberMismatch',
+           'CommandInfo',
+           'CommandNode',
+           'CommandParser',
+           'filter_str',
+           'InvalidArgumentValue',
+           'Node',
+           'Store',
+           'SubCommandError',
+           'SubCommandExpectedError',
+           'SubCommandNotFound',
+           'TypedClientCommand',
+           'TypedSayCommand',
+           'TypedServerCommand',
+           )
+
+
 # =============================================================================
 # >> CONSTANTS
 # =============================================================================

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

@@ -289,7 +289,7 @@ def get_model(self):
     def set_model(self, model):
         """Set the entity's model to the given model."""
         self.model_index = model.index
-        self.set_key_value_string('model', model.path)
+        self.model_name = model.path
 
     model = property(
         get_model, set_model,

src/core/modules/entities/entities.h

@@ -43,6 +43,23 @@
 #include "entities_entity.h"
 
 
+//-----------------------------------------------------------------------------
+// IServerEntity extension class.
+//-----------------------------------------------------------------------------
+class ServerEntityExt
+{
+public:
+	static void SetModelName(IServerEntity *pServerEntity, const char *szModelName)
+	{
+		CBaseEntity *pBaseEntity = pServerEntity->GetBaseEntity();
+		if (!pBaseEntity)
+			BOOST_RAISE_EXCEPTION(PyExc_ValueError, "BaseEntity is NULL.");
+
+		((CBaseEntityWrapper *)pBaseEntity)->SetKeyValue("model", szModelName);
+	}
+};
+
+
 //-----------------------------------------------------------------------------
 // CTakeDamageInfo wrapper class.
 //-----------------------------------------------------------------------------

src/core/modules/entities/entities_wrap.cpp

@@ -206,6 +206,7 @@ void export_server_entity(scope _entities)
 
 		.add_property("model_name",
 			&IServerEntity::GetModelName,
+			&ServerEntityExt::SetModelName,
 			"Returns the name of the model this entity is using."
 		)