diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-18 14:00:15 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-18 14:00:15 -0300 |
| commit | be46be78012e98d68b960437bf3d33e577948548 (patch) | |
| tree | a90870e00664ad963b2c66a704da6bcc3a2bb3d2 /modules/gdscript | |
| parent | 3b434eacde58450965708c3eafb6b22eb2a99361 (diff) | |
-renamed function to get object from instance id
-added function to get list of tiles used
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gd_functions.cpp | 8 | ||||
| -rw-r--r-- | modules/gdscript/gd_functions.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp index d4b8639c9b..d10570f9f4 100644 --- a/modules/gdscript/gd_functions.cpp +++ b/modules/gdscript/gd_functions.cpp @@ -98,7 +98,7 @@ const char *GDFunctions::get_func_name(Function p_func) { "dict2inst", "hash", "print_stack", - "get_inst", + "instance_from_id", }; return _names[p_func]; @@ -904,7 +904,7 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va }; } break; - case GET_INST: { + case INSTANCE_FROM_ID: { VALIDATE_ARG_COUNT(1); if (p_args[0]->get_type()!=Variant::INT && p_args[0]->get_type()!=Variant::REAL) { @@ -1316,8 +1316,8 @@ MethodInfo GDFunctions::get_info(Function p_func) { return mi; } break; - case GET_INST: { - MethodInfo mi("get_info",PropertyInfo(Variant::INT,"instance_id")); + case INSTANCE_FROM_ID: { + MethodInfo mi("instance_from_id",PropertyInfo(Variant::INT,"instance_id")); mi.return_val.type=Variant::OBJECT; return mi; } break; diff --git a/modules/gdscript/gd_functions.h b/modules/gdscript/gd_functions.h index 4fbfe99228..321b11104a 100644 --- a/modules/gdscript/gd_functions.h +++ b/modules/gdscript/gd_functions.h @@ -94,7 +94,7 @@ public: DICT2INST, HASH, PRINT_STACK, - GET_INST, + INSTANCE_FROM_ID, FUNC_MAX }; |