mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-18 04:19:19 +02:00
build 170626. individual self-illumination levels for interior sections, automatic merging of suitable terrain geometry during load from text files, unused resource release by geometry bank manager, support for ui backgrounds with width:height ratio other than 4:3, comment parsing optimization, minor bug fixes
This commit is contained in:
17
parser.cpp
17
parser.cpp
@@ -201,14 +201,19 @@ std::string cParser::readQuotes(char const Quote) { // read the stream until spe
|
||||
return token;
|
||||
}
|
||||
|
||||
std::string cParser::readComment( std::string const &Break ) { // pobieranie znaków aż do znalezienia znacznika końca
|
||||
std::string token = "";
|
||||
void cParser::skipComment( std::string const &Endmark ) { // pobieranie znaków aż do znalezienia znacznika końca
|
||||
std::string input = "";
|
||||
auto const endmarksize = Endmark.size();
|
||||
while( mStream->peek() != EOF ) { // o ile nie koniec pliku
|
||||
token += mStream->get(); // pobranie znaku
|
||||
if( token.rfind( Break ) != std::string::npos ) // szukanie znacznika końca
|
||||
input += mStream->get(); // pobranie znaku
|
||||
if( input.find( Endmark ) != std::string::npos ) // szukanie znacznika końca
|
||||
break;
|
||||
if( input.size() >= endmarksize ) {
|
||||
// keep the read text short, to avoid pointless string re-allocations on longer comments
|
||||
input = input.substr( 1 );
|
||||
}
|
||||
}
|
||||
return token;
|
||||
return;
|
||||
}
|
||||
|
||||
bool cParser::findQuotes( std::string &String ) {
|
||||
@@ -228,7 +233,7 @@ bool cParser::trimComments(std::string &String)
|
||||
{
|
||||
if (String.rfind((*cmIt).first) != std::string::npos)
|
||||
{
|
||||
readComment((*cmIt).second);
|
||||
skipComment((*cmIt).second);
|
||||
String.resize(String.rfind((*cmIt).first));
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user