eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix related to commented out WriteLog call, also improved formatting of the modified code

Browse Source
This commit is contained in:
Artur Torun
2025-10-14 20:19:35 +01:00
parent af4edcc734
commit 9901fc98b3
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
parser.cpp
View File

@@ -253,14 +253,15 @@ 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->allowRandomIncludes = allowRandomIncludes; mIncludeParser = std::make_shared<cParser>(includefile, buffer_FILE, mPath, LoadTraction, readParameters(*this));
mIncludeParser->autoclear( m_autoclear ); mIncludeParser->allowRandomIncludes = allowRandomIncludes;
if( mIncludeParser->mSize <= 0 ) { mIncludeParser->autoclear(m_autoclear);
ErrorLog( "Bad include: can't open file \"" + includefile + "\"" ); if (mIncludeParser->mSize <= 0) {
} ErrorLog("Bad include: can't open file \"" + includefile + "\"");
}
} }
else else
{ {
@@ -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));