UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Nicholas Hastings 2012-09-06 17:43:19 -04:00
commit c56d550333
5 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -9,3 +9,4 @@ f74e1dea2ef2c5a12b5238badc0e877106804191 sourcemod-1.4.1
608f4c94872e3624404a1d105284163bc57fadf7 sourcemod-1.4.3 608f4c94872e3624404a1d105284163bc57fadf7 sourcemod-1.4.3
29186166cc99e73c61995a0bd0450fc6c36466bc sourcemod-1.4.4 29186166cc99e73c61995a0bd0450fc6c36466bc sourcemod-1.4.4
9560adae2a7263e6e076d5bc2e1c2838c27d686a sourcemod-1.4.5 9560adae2a7263e6e076d5bc2e1c2838c27d686a sourcemod-1.4.5
56a9ba4cd1e2ca8a583f7e150af058ce5d41ca33 sourcemod-1.4.6

12
changelog.txt
View File

@ -1,6 +1,16 @@
SourceMod Changelog 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] SourceMod 1.4.5 [2012-09-03]

11
core/HalfLife2.cpp
View File

@ -352,11 +352,16 @@ typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name, bool *i
{ {
if (isNested) if (isNested)
{ {
*isNested = true; *isNested = (UTIL_FindInDataMap(pMap->dataDesc[i].td, name, NULL) != NULL);
return 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. } else { // Use the old behaviour, we dont want to spring this on extensions - even if they're doing bad things.
typedescription_t *_td; 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; return _td;
} }

4
plugins/include/version.inc
View File

@ -37,6 +37,6 @@
#define SOURCEMOD_V_MAJOR 1 /**< SourceMod Major version */ #define SOURCEMOD_V_MAJOR 1 /**< SourceMod Major version */
#define SOURCEMOD_V_MINOR 4 /**< SourceMod Minor 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) */

2
product.version
View File

@ -1 +1 @@
1.4.6-dev 1.4.7-dev