Преглед на файлове

-Added missing functions to the doc, fixes #3583

Juan Linietsky преди 9 години
родител
ревизия
61f03c98c8
променени са 2 файла, в които са добавени 24 реда и са изтрити 1 реда
  1. 24 0
      modules/gdscript/gd_editor.cpp
  2. 0 1
      scene/resources/packed_scene.cpp

+ 24 - 0
modules/gdscript/gd_editor.cpp

@@ -285,6 +285,30 @@ void GDScriptLanguage::get_public_functions(List<MethodInfo> *p_functions) const
 
 		p_functions->push_back(GDFunctions::get_info(GDFunctions::Function(i)));
 	}
+
+	//not really "functions", but..
+	{
+		MethodInfo mi;
+		mi.name="preload:Resource";
+		mi.arguments.push_back(PropertyInfo(Variant::STRING,"path"));
+		mi.return_val=PropertyInfo(Variant::OBJECT,"",PROPERTY_HINT_RESOURCE_TYPE,"Resource");
+		p_functions->push_back(mi);
+	}
+	{
+		MethodInfo mi;
+		mi.name="yield";
+		mi.arguments.push_back(PropertyInfo(Variant::OBJECT,"object"));
+		mi.arguments.push_back(PropertyInfo(Variant::STRING,"signal"));
+		mi.default_arguments.push_back(Variant::NIL);
+		mi.default_arguments.push_back(Variant::STRING);
+		p_functions->push_back(mi);
+	}
+	{
+		MethodInfo mi;
+		mi.name="assert";
+		mi.arguments.push_back(PropertyInfo(Variant::BOOL,"condition"));
+		p_functions->push_back(mi);
+	}
 }
 
 void GDScriptLanguage::get_public_constants(List<Pair<String,Variant> > *p_constants) const {

+ 0 - 1
scene/resources/packed_scene.cpp

@@ -239,7 +239,6 @@ Node *SceneState::instance(bool p_gen_edit_state) const {
 				} else {
 					node->_set_name_nocheck( snames[ n.name ] );
 				}
-
 			}
 
 			if (n.owner>=0) {