diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:29:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-05 16:29:19 +0100 |
| commit | 131631b00997b39b5fce07483176ee465141cdff (patch) | |
| tree | d4ccb67d62f4bc3bd7f1c1c429988f550f5e7757 | |
| parent | 07df8a02e626988ac340cf83d04109298a79457a (diff) | |
| parent | 1531f6fe017bfc28c14740aa794c18a507c2e5f5 (diff) | |
| download | redot-engine-131631b00997b39b5fce07483176ee465141cdff.tar.gz | |
Merge pull request #7959 from karroffel/powerstate-ptrcall-fix
really fixed PTRCALL now
| -rw-r--r-- | core/method_ptrcall.h | 1 | ||||
| -rw-r--r-- | core/variant.cpp | 6 | ||||
| -rw-r--r-- | core/variant.h | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/core/method_ptrcall.h b/core/method_ptrcall.h index e175a10156..3a205d5e78 100644 --- a/core/method_ptrcall.h +++ b/core/method_ptrcall.h @@ -120,6 +120,7 @@ MAKE_PTRARG(PoolVector2Array); MAKE_PTRARG(PoolVector3Array); MAKE_PTRARG(PoolColorArray); MAKE_PTRARG(Variant); +MAKE_PTRARG(PowerState); //this is for Object diff --git a/core/variant.cpp b/core/variant.cpp index f19dacf26b..6fd0618250 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -2178,11 +2178,6 @@ Variant::operator IP_Address() const { return IP_Address( operator String() ); } -Variant::operator PowerState() const -{ - return (PowerState) operator int(); -} - Variant::Variant(bool p_bool) { type=BOOL; @@ -2653,6 +2648,7 @@ Variant::Variant(const IP_Address& p_address) { memnew_placement( _data._mem, String( p_address ) ); } + Variant::Variant(const Variant& p_variant) { type=NIL; diff --git a/core/variant.h b/core/variant.h index 1251189314..f0c0d65852 100644 --- a/core/variant.h +++ b/core/variant.h @@ -255,7 +255,6 @@ public: operator Orientation() const; operator IP_Address() const; - operator PowerState() const; Variant(bool p_bool); |