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 /core/variant.cpp | |
| 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
Diffstat (limited to 'core/variant.cpp')
| -rw-r--r-- | core/variant.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
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; |