diff options
Diffstat (limited to 'platform/android/os_android.h')
| -rw-r--r-- | platform/android/os_android.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/platform/android/os_android.h b/platform/android/os_android.h index 2c0be8e3c1..f1da2867f0 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -6,6 +6,7 @@ /* http://www.godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -35,7 +36,7 @@ #include "main/input_default.h" #include "os/input.h" #include "os/main_loop.h" -#include "power_android.h" +//#include "power_android.h" #include "servers/audio_server.h" #include "servers/physics/physics_server_sw.h" #include "servers/physics_2d/physics_2d_server_sw.h" @@ -94,7 +95,6 @@ private: Vector<TouchPos> touch; Point2 last_mouse; - unsigned int last_id; GFXInitFunc gfx_init_func; void *gfx_init_ud; @@ -104,7 +104,6 @@ private: bool use_16bits_fbo; - Rasterizer *rasterizer; VisualServer *visual_server; PhysicsServer *physics_server; Physics2DServer *physics_2d_server; @@ -141,7 +140,7 @@ private: SetKeepScreenOnFunc set_keep_screen_on_func; AlertFunc alert_func; - power_android *power_manager; + //power_android *power_manager; public: // functions used by main to initialize/deintialize the OS @@ -172,7 +171,7 @@ public: virtual void set_mouse_show(bool p_show); virtual void set_mouse_grab(bool p_grab); virtual bool is_mouse_grab_enabled() const; - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual int get_mouse_button_state() const; virtual void set_window_title(const String &p_title); |