diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 15:48:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-05 15:48:06 +0100 |
commit | f4fb19d11ac9ffa029cf0212aea3eb007deabbc0 (patch) | |
tree | d785fc8a060819735ae7e841cec9e1a7e410ce8c | |
parent | e1c1d7d1d7d9b3f3f64c9887107f55a22f5d0a31 (diff) | |
parent | 15838f37028a19e7b78f2125d93051acbea13621 (diff) | |
download | redot-engine-f4fb19d11ac9ffa029cf0212aea3eb007deabbc0.tar.gz |
Merge pull request #7958 from karroffel/powerstate-ptrcall-fix
Added PowerState casting operator to Variant
-rw-r--r-- | core/variant.cpp | 5 | ||||
-rw-r--r-- | core/variant.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index f45c3fd55d..f19dacf26b 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -2178,6 +2178,11 @@ 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; diff --git a/core/variant.h b/core/variant.h index f9ceca1ca0..1251189314 100644 --- a/core/variant.h +++ b/core/variant.h @@ -45,6 +45,7 @@ #include "path_db.h" #include "simple_type.h" #include "os/input_event.h" +#include "os/power.h" #include "color.h" #include "face3.h" #include "ref_ptr.h" @@ -254,6 +255,7 @@ public: operator Orientation() const; operator IP_Address() const; + operator PowerState() const; Variant(bool p_bool); |