-Added configuration warning system for nodes

-Added a new "add" and "instance" buttons for scene tree
-Added a vformat() function to ease translation work
This commit is contained in:
Juan Linietsky 2016-05-17 18:27:15 -03:00
parent 3a26e14a2b
commit c195c0df6b
63 changed files with 531 additions and 146 deletions

View file

@ -3048,3 +3048,47 @@ String Variant::get_call_error_text(Object* p_base, const StringName& p_method,c
}
return "'"+class_name+"::"+String(p_method)+"': "+err_text;
}
String vformat(const String& p_text, const Variant& p1,const Variant& p2,const Variant& p3,const Variant& p4,const Variant& p5) {
Array args;
if (p1.get_type()!=Variant::NIL) {
args.push_back(p1);
if (p2.get_type()!=Variant::NIL) {
args.push_back(p2);
if (p3.get_type()!=Variant::NIL) {
args.push_back(p3);
if (p4.get_type()!=Variant::NIL) {
args.push_back(p4);
if (p5.get_type()!=Variant::NIL) {
args.push_back(p5);
}
}
}
}
}
bool error=false;
String fmt = p_text.sprintf(args,&error);
ERR_FAIL_COND_V(error,String());
return fmt;
}