Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-15 00:23:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #7958 from karroffel/powerstate-ptrcall-fix

Browse Source 
Added PowerState casting operator to Variant
This commit is contained in:
Rémi Verschelde 2017-03-05 15:48:06 +01:00 committed by GitHub
commit f4fb19d11a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/variant.cpp
View File

@ -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;

2
core/variant.h
View File

@ -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);