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

Fixed is_playing funtion (was reporting wrong), closes #13928

Browse source 
Made error reporting to opcode_set in gdscript a bit clearer
This commit is contained in:
Juan Linietsky 2017-12-07 18:14:39 -03:00
parent 8717afbfe1
commit dcab01618a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/gdscript/gdscript_function.cpp
View file

@ -515,7 +515,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
} else { } else {
v = "of type '" + _get_var_type(index) + "'"; v = "of type '" + _get_var_type(index) + "'";
} }
err_text = "Invalid set index " + v + " (on base: '" + _get_var_type(dst) + "')."; err_text = "Invalid set index " + v + " (on base: '" + _get_var_type(dst) + "') with value of type '"+_get_var_type(value)+"'";
OPCODE_BREAK; OPCODE_BREAK;
} }
#endif #endif
@ -574,7 +574,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (!valid) { if (!valid) {
String err_type; String err_type;
err_text = "Invalid set index '" + String(*index) + "' (on base: '" + _get_var_type(dst) + "')."; err_text = "Invalid set index '" + String(*index) + "' (on base: '" + _get_var_type(dst) + "') with value of type '"+_get_var_type(value)+"'.";
OPCODE_BREAK; OPCODE_BREAK;
} }
#endif #endif

2
scene/2d/animated_sprite.cpp
View file

@ -568,7 +568,7 @@ void AnimatedSprite::stop() {
bool AnimatedSprite::is_playing() const { bool AnimatedSprite::is_playing() const {
return is_processing(); return playing;
} }
void AnimatedSprite::_reset_timeout() { void AnimatedSprite::_reset_timeout() {