diff --git a/core/method_ptrcall.h b/core/method_ptrcall.h index e175a10156a..3a205d5e785 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 f19dacf26b2..6fd06182504 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 12511893143..f0c0d65852f 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);