merge the actual useful, sane appearing changes from DNC. the changes to the crafting system and packet settings may not be so good

This commit is contained in:
CodeCodon
2015-08-02 17:10:04 -05:00
parent 3a13a83ee3
commit 3668521963
16 changed files with 142 additions and 154 deletions
@@ -460,12 +460,12 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const
//-----------------------------------------------------------------
else if (isAbbrev( argv[0], "dumpMemToFile"))
{
//std::string fileName(Unicode::wideToNarrow(argv[1]));
//std::string leakStr(Unicode::wideToNarrow(argv[2]));
//bool leak = (leakStr == "true" || leakStr == "1");
//
//MemoryManager::reportToFile(fileName.c_str(), leak);
//result += getErrorMessage (argv[0], ERR_SUCCESS);
std::string fileName(Unicode::wideToNarrow(argv[1]));
std::string leakStr(Unicode::wideToNarrow(argv[2]));
bool leak = (leakStr == "true" || leakStr == "1");
MemoryManager::reportToFile(fileName.c_str(), leak);
result += getErrorMessage (argv[0], ERR_SUCCESS);
}
//-----------------------------------------------------------------