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

AMTL updates and changes to adapt for them to fix menu crashes (bug 5921, r=psychonic).

Browse Source 
AMTL:
Removes isVoid from AString.
Fixes support inserting to Vector at length.

--HG--
extra : rebase_source : 02805fad60c2b759a0e2e91c081144854a8e0b54
This commit is contained in:
David Anderson
2013-11-30 10:51:28 -05:00
parent fa057e76f3
commit f0e4fe66ba
7 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/logic/HandleSys.cpp
+7 -9
View File
@@ -204,10 +204,8 @@ HandleType_t HandleSystem::CreateType(const char *name,
pType->dispatch = dispatch;
if (name && name[0] != '\0')
{
pType->name = name;
pType->name = new ke::AString(name);
m_TypeLookup.insert(name, pType);
} else {
pType->name.setVoid();
}
pType->opened = 0;
@@ -924,8 +922,8 @@ bool HandleSystem::RemoveType(HandleType_t type, IdentityToken_t *ident)
pType->dispatch = NULL;
/* Remove it from the type cache. */
if (!pType->name.isVoid())
m_TypeLookup.remove(pType->name.chars());
if (pType->name)
m_TypeLookup.remove(pType->name->chars());
return true;
}
@@ -1050,8 +1048,8 @@ bool HandleSystem::TryAndFreeSomeHandles()
continue; /* We may have gaps, it's fine. */
}
if (!m_Types[i].name.isVoid())
pTypeName = m_Types[i].name.chars();
if (m_Types[i].name)
pTypeName = m_Types[i].name->chars();
else
pTypeName = "ANON";
@@ -1118,8 +1116,8 @@ void HandleSystem::Dump(HANDLE_REPORTER rep)
unsigned int size = 0;
unsigned int parentIdx;
bool bresult;
if (!pType->name.isVoid())
type = pType->name.chars();
if (pType->name)
type = pType->name->chars();
if ((parentIdx = m_Handles[i].clone) != 0)
{
core/logic/HandleSys.h
+2 -2
View File
@@ -103,11 +103,11 @@ struct QHandleType
TypeAccess typeSec;
HandleAccess hndlSec;
unsigned int opened;
ke::AString name;
ke::AutoPtr<ke::AString> name;
static inline bool matches(const char *key, const QHandleType *type)
{
return type->name.compare(key) == 0;
return type->name && type->name->compare(key) == 0;
}
};