asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "add flag and multiline hits in GDScript"

Browse source 
This reverts commit 7843ec6633.
This commit is contained in:
eska 2015-10-16 16:18:46 +02:00
parent aad2bbdb6f
commit e18c1ba05b
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/gdscript/gd_parser.cpp
View file

@ -2607,23 +2607,16 @@ void GDParser::_parse_class(ClassNode *p_class) {
} else if (tokenizer->get_token()==GDTokenizer::TK_IDENTIFIER) { } else if (tokenizer->get_token()==GDTokenizer::TK_IDENTIFIER) {
String identifier = tokenizer->get_token_identifier(); String identifier = tokenizer->get_token_identifier();
if (identifier == "flag") { if (!ObjectTypeDB::is_type(identifier,"Resource")) {
current_export.type=Variant::INT;
current_export.hint=PROPERTY_HINT_ALL_FLAGS; current_export=PropertyInfo();
}else if (identifier == "multiline"){ _set_error("Export hint not a type or resource.");
current_export.type=Variant::STRING;
current_export.hint=PROPERTY_HINT_MULTILINE_TEXT;
} else {
if (!ObjectTypeDB::is_type(identifier,"Resource")) {
current_export=PropertyInfo();
_set_error("Export hint not a type or resource.");
}
current_export.type=Variant::OBJECT;
current_export.hint=PROPERTY_HINT_RESOURCE_TYPE;
current_export.hint_string=identifier;
} }
current_export.type=Variant::OBJECT;
current_export.hint=PROPERTY_HINT_RESOURCE_TYPE;
current_export.hint_string=identifier;
tokenizer->advance(); tokenizer->advance();
} }