diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-01-26 00:03:33 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-01-26 00:03:33 +0100 |
| commit | 7af864f4673a27cf41e6904fcfc267fb0a017528 (patch) | |
| tree | f11a14dda4c5742aaf6a5f40194db14e9944e0e3 /modules/gdscript | |
| parent | 0be3c3084aa6fd86ff2fe187e19de35f804fa999 (diff) | |
| parent | e38b797c97adda92792a1b461c97ce6e6481aca9 (diff) | |
Merge pull request #3445 from akien-mga/master
Add missing return for typeof() MethodInfo
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gd_functions.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp index e015ddb65e..9b7d8eeac4 100644 --- a/modules/gdscript/gd_functions.cpp +++ b/modules/gdscript/gd_functions.cpp @@ -1355,9 +1355,12 @@ MethodInfo GDFunctions::get_info(Function p_func) { return mi; } break; case TYPE_OF: { + MethodInfo mi("typeof",PropertyInfo(Variant::NIL,"what")); mi.return_val.type=Variant::INT; - }; + return mi; + + } break; case TEXT_STR: { MethodInfo mi("str",PropertyInfo(Variant::NIL,"what"),PropertyInfo(Variant::NIL,"...")); |