diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-12 14:45:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 14:45:49 +0100 |
| commit | ab9f7f4fc235678f948e227d7d53965685d0b9c2 (patch) | |
| tree | 883c2f2b833e81d93b2a3a5445e5af75449e04f4 | |
| parent | bab9759645d29686c480d9bd0e6b1c50e4f541ef (diff) | |
| parent | a066f896d861a9b01e6aa55f51fc9d42e407b077 (diff) | |
Merge pull request #15622 from Paulloz/fix-mono-build
Fix mono build
| -rw-r--r-- | core/bind/core_bind.cpp | 2 | ||||
| -rw-r--r-- | core/bind/core_bind.h | 2 | ||||
| -rw-r--r-- | core/io/packet_peer.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index c7039353ae..32b94b9b02 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -2585,7 +2585,7 @@ void _Engine::set_target_fps(int p_fps) { Engine::get_singleton()->set_target_fps(p_fps); } -float _Engine::get_target_fps() const { +int _Engine::get_target_fps() const { return Engine::get_singleton()->get_target_fps(); } diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index bc5b8ea04c..2353b6d09f 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -656,7 +656,7 @@ public: int get_iterations_per_second() const; void set_target_fps(int p_fps); - float get_target_fps() const; + int get_target_fps() const; float get_frames_per_second() const; diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp index 0a54a84c8c..bd851ebb6d 100644 --- a/core/io/packet_peer.cpp +++ b/core/io/packet_peer.cpp @@ -155,7 +155,7 @@ void PacketPeerStream::_set_stream_peer(REF p_peer) { void PacketPeerStream::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_stream_peer", "peer"), &PacketPeerStream::_set_stream_peer); + ClassDB::bind_method(D_METHOD("set_stream_peer", "peer"), &PacketPeerStream::set_stream_peer); ClassDB::bind_method(D_METHOD("get_stream_peer"), &PacketPeerStream::get_stream_peer); ClassDB::bind_method(D_METHOD("set_input_buffer_max_size", "max_size_bytes"), &PacketPeerStream::set_input_buffer_max_size); ClassDB::bind_method(D_METHOD("set_output_buffer_max_size", "max_size_bytes"), &PacketPeerStream::set_output_buffer_max_size); |