diff options
| author | Rémi Verschelde | 2017-05-02 11:32:48 +0200 |
|---|---|---|
| committer | GitHub | 2017-05-02 11:32:48 +0200 |
| commit | acaa01dfa76fcf538c4aba993e9ac0ae1dde9b5d (patch) | |
| tree | 9c51789ed5f03364c8714bbcbb0d5be35ffbfeb9 /core/variant_parser.cpp | |
| parent | 8e64b27585c416095fbfae0f8c7aca618519e43b (diff) | |
| parent | 7ce8342ac5c0e0a302559d3ef561ffd9dc74ff2c (diff) | |
| download | godot-acaa01dfa76fcf538c4aba993e9ac0ae1dde9b5d.tar.gz godot-acaa01dfa76fcf538c4aba993e9ac0ae1dde9b5d.tar.zst godot-acaa01dfa76fcf538c4aba993e9ac0ae1dde9b5d.zip | |
Merge pull request #8610 from akien-mga/project-file-extension
Rename project file to "project.godot"
Diffstat (limited to 'core/variant_parser.cpp')
| -rw-r--r-- | core/variant_parser.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index 5e12b230b..234156d39 100644 --- a/core/variant_parser.cpp +++ b/core/variant_parser.cpp @@ -409,7 +409,7 @@ Error VariantParser::_parse_enginecfg(Stream *p_stream, Vector<String> &strings, Token token; get_token(p_stream, token, line, r_err_str); if (token.type != TK_PARENTHESIS_OPEN) { - r_err_str = "Expected '(' in old-style godot.cfg construct"; + r_err_str = "Expected '(' in old-style project.godot construct"; return ERR_PARSE_ERROR; } @@ -420,7 +420,7 @@ Error VariantParser::_parse_enginecfg(Stream *p_stream, Vector<String> &strings, CharType c = p_stream->get_char(); if (p_stream->is_eof()) { - r_err_str = "Unexpected EOF while parsing old-style godot.cfg construct"; + r_err_str = "Unexpected EOF while parsing old-style project.godot construct"; return ERR_PARSE_ERROR; } @@ -1273,7 +1273,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, value = arr; return OK; - } else if (id == "key") { // compatibility with godot.cfg + } else if (id == "key") { // compatibility with project.godot Vector<String> params; Error err = _parse_enginecfg(p_stream, params, line, r_err_str); @@ -1309,7 +1309,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, value = ie; return OK; - } else if (id == "mbutton") { // compatibility with godot.cfg + } else if (id == "mbutton") { // compatibility with project.godot Vector<String> params; Error err = _parse_enginecfg(p_stream, params, line, r_err_str); @@ -1324,7 +1324,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, value = ie; return OK; - } else if (id == "jbutton") { // compatibility with godot.cfg + } else if (id == "jbutton") { // compatibility with project.godot Vector<String> params; Error err = _parse_enginecfg(p_stream, params, line, r_err_str); @@ -1339,7 +1339,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, value = ie; return OK; - } else if (id == "jaxis") { // compatibility with godot.cfg + } else if (id == "jaxis") { // compatibility with project.godot Vector<String> params; Error err = _parse_enginecfg(p_stream, params, line, r_err_str); @@ -1357,19 +1357,19 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, value = ie; return OK; - } else if (id == "img") { // compatibility with godot.cfg + } else if (id == "img") { // compatibility with project.godot Token token; // FIXME: no need for this declaration? the first argument in line 509 is a Token& token. get_token(p_stream, token, line, r_err_str); if (token.type != TK_PARENTHESIS_OPEN) { - r_err_str = "Expected '(' in old-style godot.cfg construct"; + r_err_str = "Expected '(' in old-style project.godot construct"; return ERR_PARSE_ERROR; } while (true) { CharType c = p_stream->get_char(); if (p_stream->is_eof()) { - r_err_str = "Unexpected EOF in old style godot.cfg img()"; + r_err_str = "Unexpected EOF in old style project.godot img()"; return ERR_PARSE_ERROR; } if (c == ')') |