asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6686 from Faless/inputevent_none_fix

Browse source 
Properly encode InputEvent of type NONE. Fix #5987
This commit is contained in:
Rémi Verschelde 2016-10-03 12:11:53 +02:00 committed by GitHub
commit 1d2743302f
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/variant_parser.cpp
View file

@ -986,7 +986,18 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in
InputEvent ie; 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); get_token(p_stream,token,line,r_err_str);
if (token.type!=TK_COMMA) { if (token.type!=TK_COMMA) {
@ -2093,6 +2104,9 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str
case InputEvent::JOYSTICK_MOTION: { case InputEvent::JOYSTICK_MOTION: {
str+="JAXIS,"+itos(ev.joy_motion.axis)+","+itos(ev.joy_motion.axis_value); str+="JAXIS,"+itos(ev.joy_motion.axis)+","+itos(ev.joy_motion.axis_value);
} break; } break;
case InputEvent::NONE: {
str+="NONE";
} break;
default: {} default: {}
} }