godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #2776 from eska014/extend-object 

GDScript: Allow extending directly from Object
This commit is contained in:
Juan Linietsky 2015-11-18 18:39:51 -03:00
parent 0bbe1e1657 bbc42a159c
commit 4dc06dfdcd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/gd_parser.cpp
View File

@ -1940,9 +1940,15 @@ void GDParser::_parse_extends(ClassNode *p_class) {
p_class->extends_used=true; p_class->extends_used=true;
//see if inheritance happens from a file
tokenizer->advance(); 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) { if (tokenizer->get_token()==GDTokenizer::TK_CONSTANT) {
Variant constant = tokenizer->get_token_constant(); Variant constant = tokenizer->get_token_constant();