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

Remove memtables from GameConfigs (bug 5899 part 4, r=fyren).

Browse Source
This commit is contained in:
David Anderson 2013-08-31 19:50:26 -07:00
parent 67ce8aff61
commit b917c540aa
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/logic/GameConfigs.cpp
View File

@ -119,7 +119,6 @@ static bool DoesEngineMatch(const char *value)
CGameConfig::CGameConfig(const char *file, const char *engine) CGameConfig::CGameConfig(const char *file, const char *engine)
{ {
strncopy(m_File, file, sizeof(m_File)); strncopy(m_File, file, sizeof(m_File));
m_pStrings = new BaseStringTable(512);
m_CustomLevel = 0; m_CustomLevel = 0;
m_CustomHandler = NULL; m_CustomHandler = NULL;
@ -352,7 +351,8 @@ SMCResult CGameConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key
m_Offsets.replace(m_offset, atoi(value)); m_Offsets.replace(m_offset, atoi(value));
} }
} else if (m_ParseState == PSTATE_GAMEDEFS_KEYS) { } else if (m_ParseState == PSTATE_GAMEDEFS_KEYS) {
m_Keys.replace(key, m_pStrings->AddString(value)); ke::AString vstr(value);
m_Keys.replace(key, ke::Move(vstr));
} else if (m_ParseState == PSTATE_GAMEDEFS_SUPPORTED) { } else if (m_ParseState == PSTATE_GAMEDEFS_SUPPORTED) {
if (strcmp(key, "game") == 0) if (strcmp(key, "game") == 0)
{ {
@ -757,7 +757,6 @@ static MasterReader master_reader;
bool CGameConfig::Reparse(char *error, size_t maxlength) bool CGameConfig::Reparse(char *error, size_t maxlength)
{ {
/* Reset cached data */ /* Reset cached data */
m_pStrings->Reset();
m_Offsets.clear(); m_Offsets.clear();
m_Props.clear(); m_Props.clear();
m_Keys.clear(); m_Keys.clear();
@ -921,10 +920,10 @@ bool CGameConfig::GetOffset(const char *key, int *value)
const char *CGameConfig::GetKeyValue(const char *key) const char *CGameConfig::GetKeyValue(const char *key)
{ {
int address; StringHashMap<ke::AString>::Result r = m_Keys.find(key);
if (!m_Keys.retrieve(key, &address)) if (!r.found())
return NULL; return NULL;
return m_pStrings->GetString(address); return r->value.chars();
} }
//memory addresses below 0x10000 are automatically considered invalid for dereferencing //memory addresses below 0x10000 are automatically considered invalid for dereferencing

4
core/logic/GameConfigs.h
View File

@ -35,7 +35,6 @@
#include "common_logic.h" #include "common_logic.h"
#include <IGameConfigs.h> #include <IGameConfigs.h>
#include <ITextParsers.h> #include <ITextParsers.h>
#include "sm_memtable.h"
#include <am-refcounting.h> #include <am-refcounting.h>
#include <sm_stringhashmap.h> #include <sm_stringhashmap.h>
#include <sm_namehashset.h> #include <sm_namehashset.h>
@ -75,12 +74,11 @@ public: //NameHashSet
return strcmp(key, value->m_File) == 0; return strcmp(key, value->m_File) == 0;
} }
private: private:
ke::AutoPtr<BaseStringTable> m_pStrings;
char m_File[PLATFORM_MAX_PATH]; char m_File[PLATFORM_MAX_PATH];
char m_CurFile[PLATFORM_MAX_PATH]; char m_CurFile[PLATFORM_MAX_PATH];
StringHashMap<int> m_Offsets; StringHashMap<int> m_Offsets;
StringHashMap<SendProp *> m_Props; StringHashMap<SendProp *> m_Props;
StringHashMap<int> m_Keys; StringHashMap<ke::AString> m_Keys;
StringHashMap<void *> m_Sigs; StringHashMap<void *> m_Sigs;
/* Parse states */ /* Parse states */
int m_ParseState; int m_ParseState;