fixed a bug where mapcyclefile might not be read properly

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401752
This commit is contained in:
David Anderson 2007-12-02 16:43:34 +00:00
parent ab2ef7a0e0
commit 98b74c2e21

View File

@ -77,7 +77,6 @@ public:
} }
void OnSourceModAllInitialized() void OnSourceModAllInitialized()
{ {
m_pMapCycleFile = icvar->FindVar("mapcyclefile");
g_SourceMod.BuildPath(Path_SM, m_ConfigFile, sizeof(m_ConfigFile), "configs/maplists.cfg"); g_SourceMod.BuildPath(Path_SM, m_ConfigFile, sizeof(m_ConfigFile), "configs/maplists.cfg");
} }
void OnSourceModShutdown() void OnSourceModShutdown()
@ -157,6 +156,8 @@ public:
return; return;
} }
m_pMapCycleFile = icvar->FindVar("mapcyclefile");
/* Dump everything we know about. */ /* Dump everything we know about. */
List<maplist_info_t *> compat; List<maplist_info_t *> compat;
DumpCache(&compat); DumpCache(&compat);
@ -343,7 +344,7 @@ public:
success = GetMapList(&pNewArray, name, &change_serial); success = GetMapList(&pNewArray, name, &change_serial);
} }
/* If either of the last two conditions failed, try again if we can. */ /* If either of the last two conditions failed, try again if we can. */
if (!success) if (!success && strcmp(name, "mapcyclefile") != 0)
{ {
success = GetMapList(&pNewArray, "mapcyclefile", &change_serial); success = GetMapList(&pNewArray, "mapcyclefile", &change_serial);
} }