Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

ObjectID converted to a structure, fixes many bugs where used incorrectly as 32 bits.

Browse source
This commit is contained in:
Juan Linietsky 2020-02-12 14:24:06 -03:00
parent 4aa31a2851
commit cf8c679a23
89 changed files with 337 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/variant.cpp
View file

@ -1248,6 +1248,14 @@ Variant::operator uint64_t() const {
}
}
Variant::operator ObjectID() const {
if (type == INT) {
return ObjectID(_data._int);
} else {
return ObjectID();
}
}
#ifdef NEED_LONG_INT
Variant::operator signed long() const {
@ -2193,6 +2201,11 @@ Variant::Variant(double p_double) {
_data._real = p_double;
}
Variant::Variant(const ObjectID &p_id) {
type = INT;
_data._int = p_id;
}
Variant::Variant(const StringName &p_string) {
type = STRING;