From d839b83b6b28440ed166dd062b0d10a47e1d6323 Mon Sep 17 00:00:00 2001 From: Asher Baker Date: Tue, 4 Sep 2012 11:41:35 +0100 Subject: [PATCH 1/5] Fixed extraneous errors related to accessing nested props (bug 5446, r=me). --- core/HalfLife2.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/core/HalfLife2.cpp b/core/HalfLife2.cpp index 8065b2a2..794f1cd0 100644 --- a/core/HalfLife2.cpp +++ b/core/HalfLife2.cpp @@ -352,11 +352,16 @@ typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name, bool *i { if (isNested) { - *isNested = true; - return NULL; + *isNested = (UTIL_FindInDataMap(pMap->dataDesc[i].td, name, NULL) != NULL); + if (*isNested) + { + return NULL; + } else { + continue; + } } else { // Use the old behaviour, we dont want to spring this on extensions - even if they're doing bad things. typedescription_t *_td; - if ((_td=UTIL_FindInDataMap(pMap->dataDesc[i].td, name, isNested)) != NULL) + if ((_td=UTIL_FindInDataMap(pMap->dataDesc[i].td, name, NULL)) != NULL) { return _td; } From 79f412c55cb6c17be21209e082119b62feaed513 Mon Sep 17 00:00:00 2001 From: Asher Baker Date: Tue, 4 Sep 2012 12:45:37 +0100 Subject: [PATCH 2/5] Updated changelog. --- changelog.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 9c796895..7f7555b1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,16 @@ SourceMod Changelog ------------------------------ + + +SourceMod 1.4.6 [2012-09-04] + +URL: http://wiki.alliedmods.net/SourceMod_1.4.6_Release_Notes + +User Changes: + + - Fixed extraneous errors resulting from a bug in 1.4.5. + +---------------------------------------------------------- SourceMod 1.4.5 [2012-09-03] From 116fbe9a7a71266e839a790f762c7edbc001ba70 Mon Sep 17 00:00:00 2001 From: Asher Baker Date: Tue, 4 Sep 2012 12:46:12 +0100 Subject: [PATCH 3/5] Updated versioning for 1.4.6 release. --- plugins/include/version.inc | 2 +- product.version | 2 +- tools/buildbot/build_type | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/include/version.inc b/plugins/include/version.inc index 609f2cec..5c6ad855 100644 --- a/plugins/include/version.inc +++ b/plugins/include/version.inc @@ -39,4 +39,4 @@ #define SOURCEMOD_V_MINOR 4 /**< SourceMod Minor version */ #define SOURCEMOD_V_RELEASE 6 /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "1.4.6-dev" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "1.4.6" /**< SourceMod version string (major.minor.release.build) */ diff --git a/product.version b/product.version index 593d9b29..c514bd85 100644 --- a/product.version +++ b/product.version @@ -1 +1 @@ -1.4.6-dev +1.4.6 diff --git a/tools/buildbot/build_type b/tools/buildbot/build_type index 38f8e886..17640be7 100644 --- a/tools/buildbot/build_type +++ b/tools/buildbot/build_type @@ -1 +1 @@ -dev +rel From 74847c5b4f51c6353b4e700b1878381557a27d85 Mon Sep 17 00:00:00 2001 From: Asher Baker Date: Tue, 4 Sep 2012 12:54:31 +0100 Subject: [PATCH 4/5] Added tag sourcemod-1.4.6 for changeset 56a9ba4cd1e2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 47fca664..30a8357d 100644 --- a/.hgtags +++ b/.hgtags @@ -9,3 +9,4 @@ f74e1dea2ef2c5a12b5238badc0e877106804191 sourcemod-1.4.1 608f4c94872e3624404a1d105284163bc57fadf7 sourcemod-1.4.3 29186166cc99e73c61995a0bd0450fc6c36466bc sourcemod-1.4.4 9560adae2a7263e6e076d5bc2e1c2838c27d686a sourcemod-1.4.5 +56a9ba4cd1e2ca8a583f7e150af058ce5d41ca33 sourcemod-1.4.6 From 6b4b5eb0b11a566ed46a56e13a6bc8f484dab778 Mon Sep 17 00:00:00 2001 From: Asher Baker Date: Tue, 4 Sep 2012 12:56:31 +0100 Subject: [PATCH 5/5] Bumping version. --- plugins/include/version.inc | 4 ++-- product.version | 2 +- tools/buildbot/build_type | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/include/version.inc b/plugins/include/version.inc index 5c6ad855..862ca711 100644 --- a/plugins/include/version.inc +++ b/plugins/include/version.inc @@ -37,6 +37,6 @@ #define SOURCEMOD_V_MAJOR 1 /**< SourceMod Major version */ #define SOURCEMOD_V_MINOR 4 /**< SourceMod Minor version */ -#define SOURCEMOD_V_RELEASE 6 /**< SourceMod Release version */ +#define SOURCEMOD_V_RELEASE 7 /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "1.4.6" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "1.4.7-dev" /**< SourceMod version string (major.minor.release.build) */ diff --git a/product.version b/product.version index c514bd85..4902420f 100644 --- a/product.version +++ b/product.version @@ -1 +1 @@ -1.4.6 +1.4.7-dev diff --git a/tools/buildbot/build_type b/tools/buildbot/build_type index 17640be7..38f8e886 100644 --- a/tools/buildbot/build_type +++ b/tools/buildbot/build_type @@ -1 +1 @@ -rel +dev