diff options
| author | Juan Linietsky | 2015-11-18 18:39:51 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-11-18 18:39:51 -0300 |
| commit | 4dc06dfdcde7ea4b84eb47e06b81c24a1d61ebd2 (patch) | |
| tree | 3eaf046e026fbad3badb4455c2d9772cba1faa62 /modules/gdscript/gd_parser.cpp | |
| parent | 0bbe1e16572b6ee0ae73f8412b8fa05421ceb1ef (diff) | |
| parent | bbc42a159c0e2ec04e317bb0766472e4d35e2819 (diff) | |
| download | godot-4dc06dfdcde7ea4b84eb47e06b81c24a1d61ebd2.tar.gz godot-4dc06dfdcde7ea4b84eb47e06b81c24a1d61ebd2.tar.zst godot-4dc06dfdcde7ea4b84eb47e06b81c24a1d61ebd2.zip | |
Merge pull request #2776 from eska014/extend-object
GDScript: Allow extending directly from Object
Diffstat (limited to 'modules/gdscript/gd_parser.cpp')
| -rw-r--r-- | modules/gdscript/gd_parser.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 313fb57d0..202ab76da 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/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(); |