diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2017-09-16 12:51:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-16 12:51:04 +0200 |
| commit | 9c71b7b91f7215828951c96f3d75b55765bdbd5a (patch) | |
| tree | 2343d20f4bf93ee66613076feef6b89370b9359d /core/bind/core_bind.cpp | |
| parent | 62cb43bb8dec8f5078012b58ff06a2077078565f (diff) | |
| parent | f1f8fd1b68aa47e8a199c11599ffa7c4af39c486 (diff) | |
| download | redot-engine-9c71b7b91f7215828951c96f3d75b55765bdbd5a.tar.gz | |
Merge pull request #11316 from neikeq/aaaaah
Adds _OS::PowerState enum
Diffstat (limited to 'core/bind/core_bind.cpp')
| -rw-r--r-- | core/bind/core_bind.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index d0acd04497..ab9c107d7a 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -440,8 +440,8 @@ bool _OS::is_vsync_enabled() const { return OS::get_singleton()->is_vsync_enabled(); } -OS::PowerState _OS::get_power_state() { - return OS::get_singleton()->get_power_state(); +_OS::PowerState _OS::get_power_state() { + return _OS::PowerState(OS::get_singleton()->get_power_state()); } int _OS::get_power_seconds_left() { @@ -1142,11 +1142,11 @@ void _OS::_bind_methods() { BIND_ENUM_CONSTANT(SYSTEM_DIR_PICTURES); BIND_ENUM_CONSTANT(SYSTEM_DIR_RINGTONES); - BIND_ENUM_CONSTANT(OS::POWERSTATE_UNKNOWN); - BIND_ENUM_CONSTANT(OS::POWERSTATE_ON_BATTERY); - BIND_ENUM_CONSTANT(OS::POWERSTATE_NO_BATTERY); - BIND_ENUM_CONSTANT(OS::POWERSTATE_CHARGING); - BIND_ENUM_CONSTANT(OS::POWERSTATE_CHARGED); + BIND_ENUM_CONSTANT(POWERSTATE_UNKNOWN); + BIND_ENUM_CONSTANT(POWERSTATE_ON_BATTERY); + BIND_ENUM_CONSTANT(POWERSTATE_NO_BATTERY); + BIND_ENUM_CONSTANT(POWERSTATE_CHARGING); + BIND_ENUM_CONSTANT(POWERSTATE_CHARGED); } _OS::_OS() { |