Fixes to OS_Server and DummyRasterizer to match new signatures

4 files changed, 14 insertions, 2 deletions

diff --git a/drivers/dummy/rasterizer_dummy.h b/drivers/dummy/rasterizer_dummy.h
index e2f2562156..6d4d87b2f3 100644
--- a/drivers/dummy/rasterizer_dummy.h
+++ b/drivers/dummy/rasterizer_dummy.h
@@ -493,6 +493,7 @@ public:
 
 	void particles_set_emission_transform(RID p_particles, const Transform &p_transform) {}
 
+	bool particles_get_emitting(RID p_particles) { return false; }
 	int particles_get_draw_passes(RID p_particles) const { return 0; }
 	RID particles_get_draw_pass_mesh(RID p_particles, int p_pass) const { return RID(); }
 
diff --git a/platform/server/detect.py b/platform/server/detect.py
index c56625e83b..fd4b6eae1c 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -28,6 +28,7 @@ def get_opts():
 def get_flags():
 
     return [
+            ("module_mobile_vr_enabled", False),
     ]
 
 
diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp
index 49ecc4389a..1340303fee 100644
--- a/platform/server/os_server.cpp
+++ b/platform/server/os_server.cpp
@@ -63,7 +63,7 @@ void OS_Server::initialize_core() {
 	OS_Unix::initialize_core();
 }
 
-void OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
+Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
 
 	args = OS::get_singleton()->get_cmdline_args();
 	current_videomode = p_desired;
@@ -81,7 +81,10 @@ void OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int p
 	power_manager = memnew(PowerX11);
 
 	_ensure_user_data_dir();
+
+	return OK;
 }
+
 void OS_Server::finalize() {
 
 	if (main_loop)
@@ -100,10 +103,12 @@ void OS_Server::finalize() {
 
 void OS_Server::set_mouse_show(bool p_show) {
 }
+
 void OS_Server::set_mouse_grab(bool p_grab) {
 
 	grab = p_grab;
 }
+
 bool OS_Server::is_mouse_grab_enabled() const {
 
 	return grab;
@@ -124,6 +129,7 @@ void OS_Server::set_window_title(const String &p_title) {
 
 void OS_Server::set_video_mode(const VideoMode &p_video_mode, int p_screen) {
 }
+
 OS::VideoMode OS_Server::get_video_mode(int p_screen) const {
 
 	return current_videomode;
@@ -171,6 +177,9 @@ void OS_Server::move_window_to_foreground() {
 void OS_Server::set_cursor_shape(CursorShape p_shape) {
 }
 
+void OS_Server::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
+}
+
 OS::PowerState OS_Server::get_power_state() {
 	return power_manager->get_power_state();
 }
diff --git a/platform/server/os_server.h b/platform/server/os_server.h
index 8ab9e028ba..2cc6f0c47e 100644
--- a/platform/server/os_server.h
+++ b/platform/server/os_server.h
@@ -73,7 +73,7 @@ protected:
 	virtual const char *get_audio_driver_name(int p_driver) const;
 
 	virtual void initialize_core();
-	virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver);
+	virtual Error initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver);
 	virtual void finalize();
 
 	virtual void set_main_loop(MainLoop *p_main_loop);
@@ -82,6 +82,7 @@ public:
 	virtual String get_name();
 
 	virtual void set_cursor_shape(CursorShape p_shape);
+	virtual void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot);
 
 	virtual void set_mouse_show(bool p_show);
 	virtual void set_mouse_grab(bool p_grab);