diff options
| author | Vicent Marti | 2008-06-13 17:47:56 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-06-13 17:47:56 +0000 |
| commit | 04b36a12e17252aa3f27392b334b053406847d8f (patch) | |
| tree | c65fc8d7a1dea0d49ed8dd7ce30a6f61f4bfeff6 /gui/ThemeParser.cpp | |
| parent | 5d92e2710a85f998f1f7bfbf4705880921d904e7 (diff) | |
| download | scummvm-rg350-04b36a12e17252aa3f27392b334b053406847d8f.tar.gz scummvm-rg350-04b36a12e17252aa3f27392b334b053406847d8f.tar.bz2 scummvm-rg350-04b36a12e17252aa3f27392b334b053406847d8f.zip | |
Formating conventions.
Function parameter fixes.
Parser fixes.
svn-id: r32696
Diffstat (limited to 'gui/ThemeParser.cpp')
| -rw-r--r-- | gui/ThemeParser.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp index fc960ca4d7..cd77b4a5e1 100644 --- a/gui/ThemeParser.cpp +++ b/gui/ThemeParser.cpp @@ -103,14 +103,15 @@ void ThemeParser::parseKeyValue(Common::String &key_name) { skipSpaces(); Common::String data; + char string_start; - if (_text[_pos] == '"') { - data += _text[_pos++]; + if (_text[_pos] == '"' || _text[_pos] == '\'') { + string_start = _text[_pos++]; - while (_text[_pos] != '"') + while (_text[_pos] != string_start) data += _text[_pos++]; - data += _text[_pos++]; + _pos++; } else { while (isValidNameChar(_text[_pos])) data += _text[_pos++]; @@ -131,7 +132,9 @@ bool ThemeParser::parse() { break; skipSpaces(); - skipComments(); + + if (skipComments()) + continue; switch (_state) { case kParserNeedKey: |