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 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] 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; } diff --git a/plugins/include/version.inc b/plugins/include/version.inc index 609f2cec..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-dev" /**< 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 593d9b29..4902420f 100644 --- a/product.version +++ b/product.version @@ -1 +1 @@ -1.4.6-dev +1.4.7-dev