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

Merge pull request #2776 from eska014/extend-object

GDScript: Allow extending directly from Object
Juan Linietsky преди 9 години
родител
ревизия
4dc06dfdcd
променени са 1 файла, в които са добавени 7 реда и са изтрити 1 реда
  1. 7 1
      modules/gdscript/gd_parser.cpp

+ 7 - 1
modules/gdscript/gd_parser.cpp

@@ -1940,9 +1940,15 @@ void GDParser::_parse_extends(ClassNode *p_class) {
 
 	p_class->extends_used=true;
 
-	//see if inheritance happens from a file
 	tokenizer->advance();
 
+	if (tokenizer->get_token()==GDTokenizer::TK_BUILT_IN_TYPE && tokenizer->get_token_type()==Variant::OBJECT) {
+		p_class->extends_class.push_back(Variant::get_type_name(Variant::OBJECT));
+		tokenizer->advance();
+		return;
+	}
+
+	// see if inheritance happens from a file
 	if (tokenizer->get_token()==GDTokenizer::TK_CONSTANT) {
 
 		Variant constant = tokenizer->get_token_constant();