From 737a359990aa3ba4e51f343bdeb3e128633304e1 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 4 Dec 2007 15:58:07 +0000 Subject: [PATCH] - removed ancient bcompat shim for translations/core.cfg file - fixed msvc8 whining about BfReadString --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401770 --- core/Translator.cpp | 15 +-------------- core/smn_bitbuffer.cpp | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/core/Translator.cpp b/core/Translator.cpp index eb6bc92e..938ad8af 100644 --- a/core/Translator.cpp +++ b/core/Translator.cpp @@ -729,20 +729,7 @@ void Translator::OnSourceModAllInitialized() unsigned int id; - //backwards compatibility shim - /* hack -- if core.cfg exists, exec it instead. */ - char path[PLATFORM_MAX_PATH]; - g_SourceMod.BuildPath(Path_SM, path, sizeof(path), "translations/core.cfg"); - - if (g_LibSys.PathExists(path)) - { - id = FindOrAddPhraseFile("core.cfg"); - } - else - { - id = FindOrAddPhraseFile("core.phrases.txt"); - } - + id = FindOrAddPhraseFile("core.phrases.txt"); g_pCorePhraseID = id; g_pCorePhrases = GetFileByIndex(id); } diff --git a/core/smn_bitbuffer.cpp b/core/smn_bitbuffer.cpp index fe8479a7..7db96957 100644 --- a/core/smn_bitbuffer.cpp +++ b/core/smn_bitbuffer.cpp @@ -497,7 +497,7 @@ static cell_t smn_BfReadString(IPluginContext *pCtx, const cell_t *params) } pCtx->LocalToPhysAddr(params[2], (cell_t **)&buf); - pBitBuf->ReadString(buf, params[3], params[4], &numChars); + pBitBuf->ReadString(buf, params[3], params[4] ? true : false, &numChars); if (pBitBuf->IsOverflowed()) {