API change to set_fullscreen(enabled,screen)

5 files changed, 10 insertions, 10 deletions

diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index 0d24486e90..62d93745a0 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -176,8 +176,8 @@ bool _OS::is_video_mode_fullscreen(int p_screen) const {
 
 }
 
-void _OS::set_fullscreen(bool p_fullscreen) {
-	OS::get_singleton()->set_fullscreen(p_fullscreen);
+void _OS::set_fullscreen(bool p_enabled,int p_screen) {
+	OS::get_singleton()->set_fullscreen(p_enabled, p_screen);
 }
 
 bool _OS::is_fullscreen() const {
@@ -641,7 +641,7 @@ void _OS::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_fullscreen_mode_list","screen"),&_OS::get_fullscreen_mode_list,DEFVAL(0));
 
 	//MSC
-	ObjectTypeDB::bind_method(_MD("set_fullscreen","fullscreen"),&_OS::set_fullscreen);
+	ObjectTypeDB::bind_method(_MD("set_fullscreen","enabled","screen"),&_OS::set_fullscreen,DEFVAL(0));
 	ObjectTypeDB::bind_method(_MD("is_fullscreen"),&_OS::is_fullscreen);
 
 	ObjectTypeDB::bind_method(_MD("set_iterations_per_second","iterations_per_second"),&_OS::set_iterations_per_second);
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index 97aff87bca..fedd03c3a9 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -109,7 +109,7 @@ public:
 	Array get_fullscreen_mode_list(int p_screen=0) const;
 
 	//MSC
-	void set_fullscreen(bool p_fullscreen);
+	void set_fullscreen(bool p_enabled, int p_screen=0);
 	bool is_fullscreen() const;
 
 	Error native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track);
diff --git a/core/os/os.h b/core/os/os.h
index e8de28e86a..b86b122623 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -151,7 +151,7 @@ public:
 	virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const=0;
 
 	//MSC
-	virtual void set_fullscreen(bool fullscreen)=0;
+	virtual void set_fullscreen(bool p_enabled,int p_screen=0)=0;
 	virtual bool is_fullscreen() const=0;
 	
 	virtual void set_iterations_per_second(int p_ips);
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 79051b2ac5..6dd2d7426f 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -521,11 +521,11 @@ void OS_X11::get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen) cons
 
 }
 
-void OS_X11::set_fullscreen(bool p_fullscreen) {
+void OS_X11::set_fullscreen(bool p_enabled,int p_screen) {
 	
 	long wm_action;
 
-	if(p_fullscreen) {
+	if(p_enabled) {
 		current_videomode.fullscreen = True;
 		wm_action = 1;
 	} else {
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index e92bd6e081..f382e21edc 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -166,8 +166,8 @@ protected:
 	virtual const char * get_video_driver_name(int p_driver) const;	
 	virtual VideoMode get_default_video_mode() const;
 
-    virtual int get_audio_driver_count() const;
-    virtual const char * get_audio_driver_name(int p_driver) const;
+	virtual int get_audio_driver_count() const;
+	virtual const char * get_audio_driver_name(int p_driver) const;
 
 	virtual void initialize(const VideoMode& p_desired,int p_video_driver,int p_audio_driver);	
 	virtual void finalize();
@@ -213,7 +213,7 @@ public:
 	virtual VideoMode get_video_mode(int p_screen=0) const;
 	virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const;
 
-	virtual void set_fullscreen(bool p_fullscreen);
+	virtual void set_fullscreen(bool p_enabled,int p_screen=0);
 	virtual bool is_fullscreen() const;
 
 	virtual void move_window_to_foreground();