Merge branch 'master' into add_default_callingconvention

Author: CookStar

addons/source-python/data/source-python/entities/CFogController.ini

@@ -2,7 +2,7 @@
 
     set_angles = SetAngles
     set_color = SetColor
-    set_color_lerp_to = SetColorLerpTO
+    set_color_lerp_to = SetColorLerpTo
     set_color_secondary = SetColorSecondary
     set_color_secondary_lerp_to = SetColorSecondaryLerpTo
     set_end_dist = SetEndDist

addons/source-python/packages/source-python/core/cache.py

@@ -74,4 +74,4 @@ def wrapper(self, *args, **kwargs):
         return MethodType(wrapper, self)
 
     # Return a cached property bound to the getter function
-    return CachedProperty(getter, doc=fget.__doc__)
+    return CachedProperty(getter, doc=fget.__doc__, unbound=True)

addons/source-python/packages/source-python/core/command/docs.py

@@ -19,6 +19,8 @@
 from core.command import core_command_logger
 from core.version import VERSION
 from core.version import is_unversioned
+#   Hooks
+from hooks.exceptions import except_hooks
 #   Paths
 from paths import SP_DATA_PATH
 from paths import SP_DOCS_PATH
@@ -87,6 +89,7 @@ def _create_source_python_docs():
             project.create(
                 'Source.Python Development Team', 'Source.Python', VERSION)
         except:
+            except_hooks.print_exception()
             logger.log_message(
                 'An error occured while creating Sphinx ' +
                 'project for Source.Python.')
@@ -108,6 +111,7 @@ def _create_custom_package_docs(package):
         try:
             project.create('Unknown')
         except:
+            except_hooks.print_exception()
             logger.log_message(
                 'An error occured while creating Sphinx project for ' +
                 'custom package "{0}".'.format(package))
@@ -129,6 +133,7 @@ def _create_plugin_docs(package):
         try:
             project.create('Unknown')
         except:
+            except_hooks.print_exception()
             logger.log_message(
                 'An error occured while creating Sphinx project ' +
                 'for plugin "{0}".'.format(package))
@@ -163,6 +168,7 @@ def _generate_source_python_docs():
         try:
             project.generate_project_files('developing/modules')
         except:
+            except_hooks.print_exception()
             logger.log_message(
                 'An error occured while generating ' +
                 'project files for Source.Python')
@@ -244,6 +250,7 @@ def _generate_custom_package_docs(package):
         try:
             project.generate_project_files()
         except:
+            except_hooks.print_exception()
             logger.log_message(
                 'An error occured while generating project ' +
                 'files for custom package "{0}".'.format(package))
@@ -265,6 +272,7 @@ def _generate_plugin_docs(package):
         try:
             project.generate_project_files()
         except:
+            except_hooks.print_exception()
             logger.log_message(
                 'An error occured while generating project ' +
                 'files for plugin "{0}".'.format(package))
@@ -324,6 +332,7 @@ def _build_source_python_docs():
         try:
             project.build()
         except:
+            except_hooks.print_exception()
             logger.log_message(
                 'An error occured while building ' +
                 'project files for Source.Python.')
@@ -384,6 +393,7 @@ def _build_custom_package_docs(package):
         try:
             project.build()
         except:
+            except_hooks.print_exception()
             logger.log_message(
                 'An error occured while building project ' +
                 'files for custom package "{0}".'.format(package))
@@ -410,6 +420,7 @@ def _build_plugin_docs(package):
         try:
             project.build()
         except:
+            except_hooks.print_exception()
             logger.log_message(
                 'An error occured while building project ' +
                 'files for plugin "{0}".'.format(package))

src/core/modules/entities/entities_entity.cpp

@@ -399,6 +399,19 @@ Color CBaseEntityWrapper::GetKeyValueColor(const char* szName)
 	if (!sputils::UTIL_StringToIntArray(iResult, 4, szResult))
 		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "KeyValue does not seem to be a color: '%s'.", szResult);
 
+	// Fix for issue #346
+	// https://github.com/Source-Python-Dev-Team/Source.Python/issues/346
+	// If we got values bigger than 255, it's not a hard-coded keyvalue, but one that is read
+	// from the datamap. Those are incorrectly parsed by the SDK (int* should be unsiged char*):
+	// https://github.com/alliedmodders/hl2sdk/blob/0ef5d3d482157bc0bb3aafd37c08961373f87bfd/game/server/saverestore_gamedll.cpp#L205-L211
+	if (iResult[0] > 255 || iResult[1] > 255 || iResult[2] > 255 || iResult[3] > 255) {
+		return Color(
+				iResult[0] & 0xff,
+				(iResult[0] & 0xff00) >> 8,
+				(iResult[0] & 0xff0000) >> 16,
+				(iResult[0] & 0xff000000) >> 24);
+	}
+
 	return Color(iResult[0], iResult[1], iResult[2], iResult[3]);
 }