mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-03-22 15:05:03 +01:00
bug fix related to commented out WriteLog call, also improved formatting of the modified code
This commit is contained in:
12
parser.cpp
12
parser.cpp
@@ -253,8 +253,9 @@ std::string cParser::readToken( bool ToLower, const char *Break ) {
|
|||||||
{
|
{
|
||||||
if (false == contains(includefile, "_ter.scm"))
|
if (false == contains(includefile, "_ter.scm"))
|
||||||
{
|
{
|
||||||
if (Global.ParserLogIncludes)
|
if (Global.ParserLogIncludes) {
|
||||||
// WriteLog("including: " + includefile);
|
// WriteLog("including: " + includefile);
|
||||||
|
}
|
||||||
mIncludeParser = std::make_shared<cParser>(includefile, buffer_FILE, mPath, LoadTraction, readParameters(*this));
|
mIncludeParser = std::make_shared<cParser>(includefile, buffer_FILE, mPath, LoadTraction, readParameters(*this));
|
||||||
mIncludeParser->allowRandomIncludes = allowRandomIncludes;
|
mIncludeParser->allowRandomIncludes = allowRandomIncludes;
|
||||||
mIncludeParser->autoclear(m_autoclear);
|
mIncludeParser->autoclear(m_autoclear);
|
||||||
@@ -271,8 +272,9 @@ std::string cParser::readToken( bool ToLower, const char *Break ) {
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (Global.ParserLogIncludes)
|
if (Global.ParserLogIncludes) {
|
||||||
WriteLog("including terrain: " + includefile);
|
WriteLog("including terrain: " + includefile);
|
||||||
|
}
|
||||||
mIncludeParser = std::make_shared<cParser>(includefile, buffer_FILE, mPath,
|
mIncludeParser = std::make_shared<cParser>(includefile, buffer_FILE, mPath,
|
||||||
LoadTraction, readParameters(*this));
|
LoadTraction, readParameters(*this));
|
||||||
mIncludeParser->allowRandomIncludes = allowRandomIncludes;
|
mIncludeParser->allowRandomIncludes = allowRandomIncludes;
|
||||||
@@ -301,8 +303,9 @@ std::string cParser::readToken( bool ToLower, const char *Break ) {
|
|||||||
{
|
{
|
||||||
if (false == contains(includefile, "_ter.scm"))
|
if (false == contains(includefile, "_ter.scm"))
|
||||||
{
|
{
|
||||||
if (Global.ParserLogIncludes)
|
if (Global.ParserLogIncludes) {
|
||||||
// WriteLog("including: " + includefile);
|
// WriteLog("including: " + includefile);
|
||||||
|
}
|
||||||
mIncludeParser = std::make_shared<cParser>(
|
mIncludeParser = std::make_shared<cParser>(
|
||||||
includefile, buffer_FILE, mPath, LoadTraction, readParameters(includeparser));
|
includefile, buffer_FILE, mPath, LoadTraction, readParameters(includeparser));
|
||||||
mIncludeParser->allowRandomIncludes = allowRandomIncludes;
|
mIncludeParser->allowRandomIncludes = allowRandomIncludes;
|
||||||
@@ -321,8 +324,9 @@ std::string cParser::readToken( bool ToLower, const char *Break ) {
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (Global.ParserLogIncludes)
|
if (Global.ParserLogIncludes) {
|
||||||
WriteLog("including terrain: " + includefile);
|
WriteLog("including terrain: " + includefile);
|
||||||
|
}
|
||||||
mIncludeParser =
|
mIncludeParser =
|
||||||
std::make_shared<cParser>(includefile, buffer_FILE, mPath, LoadTraction,
|
std::make_shared<cParser>(includefile, buffer_FILE, mPath, LoadTraction,
|
||||||
readParameters(includeparser));
|
readParameters(includeparser));
|
||||||
|
|||||||
Reference in New Issue
Block a user