aboutsummaryrefslogtreecommitdiff
path: root/modules/gdscript/gd_parser.cpp
diff options
context:
space:
mode:
authorOvnuniarchos2015-11-19 01:19:19 +0100
committerOvnuniarchos2015-11-19 01:19:19 +0100
commita9a330645b29152ccc29b6e075c0ebda24b03e37 (patch)
tree2cf319ce8453dd295c40b809b4bf54527e4fe020 /modules/gdscript/gd_parser.cpp
parent0f0dc1a5d328502343c5a902aec552fb01033504 (diff)
parent94fdd01241749cb7a575ed5f9fa4c7bbb286901a (diff)
downloadgodot-a9a330645b29152ccc29b6e075c0ebda24b03e37.tar.gz
godot-a9a330645b29152ccc29b6e075c0ebda24b03e37.tar.zst
godot-a9a330645b29152ccc29b6e075c0ebda24b03e37.zip
Diffstat (limited to 'modules/gdscript/gd_parser.cpp')
-rw-r--r--modules/gdscript/gd_parser.cpp8
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();