diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-10-03 12:11:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 12:11:53 +0200 |
| commit | 1d2743302f8e118011e5fe51fbc7bf310acb30d4 (patch) | |
| tree | b59372b1a6da19f7fd25070a535c1b4af4051757 /core/variant_parser.cpp | |
| parent | 803ccb5c7f306cc456208170ce36ac0847be45b3 (diff) | |
| parent | 941f46038415bfdc52f61b68511c83fed59fc2fe (diff) | |
Merge pull request #6686 from Faless/inputevent_none_fix
Properly encode InputEvent of type NONE. Fix #5987
Diffstat (limited to 'core/variant_parser.cpp')
| -rw-r--r-- | core/variant_parser.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index 023605a952..6b3828a572 100644 --- a/core/variant_parser.cpp +++ b/core/variant_parser.cpp @@ -986,7 +986,18 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in InputEvent ie; - if (id=="KEY") { + if (id=="NONE") { + + ie.type=InputEvent::NONE; + + get_token(p_stream,token,line,r_err_str); + + if (token.type!=TK_PARENTHESIS_CLOSE) { + r_err_str="Expected ')'"; + return ERR_PARSE_ERROR; + } + + } else if (id=="KEY") { get_token(p_stream,token,line,r_err_str); if (token.type!=TK_COMMA) { @@ -2093,6 +2104,9 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str case InputEvent::JOYSTICK_MOTION: { str+="JAXIS,"+itos(ev.joy_motion.axis)+","+itos(ev.joy_motion.axis_value); } break; + case InputEvent::NONE: { + str+="NONE"; + } break; default: {} } |