diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2016-10-13 11:28:38 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2016-10-13 11:49:22 +0200 |
| commit | 11349a786be1fd02647493cfeff9883898ffd73e (patch) | |
| tree | 88c35129b844eacbee9126b9bcdbd222e4a2ae1d /modules/gdscript | |
| parent | 12843167cacf3bacca32c29b7ea8b4426392bad0 (diff) | |
Revert "Add warning when (pre)loading paths with leading / (#4280 - #3106)"
Also closes: #6801
This reverts commit e59820ac94b7c9706298d5559608937dfca332e5.
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gd_functions.cpp | 4 | ||||
| -rw-r--r-- | modules/gdscript/gd_parser.cpp | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp index e82eb83773..e224ce4718 100644 --- a/modules/gdscript/gd_functions.cpp +++ b/modules/gdscript/gd_functions.cpp @@ -840,10 +840,6 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.argument=0; r_ret=Variant(); - } else if(((String)(*p_args[0])).begins_with("/")) { - r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; - r_error.argument=0; - r_ret=RTR("Paths cannot start with '/', absolute paths must start with 'res://', 'user://', or 'local://'"); } else { r_ret=ResourceLoader::load(*p_args[0]); } diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index e2d284ae02..434f918355 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -309,10 +309,6 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_ _set_error("expected string constant as 'preload' argument."); return NULL; } - if (path.begins_with("/")) { - _set_error("Paths cannot start with '/', absolute paths must start with \'res://\', \'user://\', or \'local://\'"); - return NULL; - } if (!path.is_abs_path() && base_path!="") path=base_path+"/"+path; path = path.replace("///","//").simplify_path(); @@ -2122,10 +2118,6 @@ void GDParser::_parse_extends(ClassNode *p_class) { _set_error("'extends' constant must be a string."); return; } - if (((String)(constant)).begins_with("/")) { - _set_error("Paths cannot start with '/', absolute paths must start with \'res://\', \'user://\', or \'local://\'"); - return; - } p_class->extends_file=constant; tokenizer->advance(); |