1 files changed, 34 insertions, 53 deletions

diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp
index 47cdbbb20..6c33fd801 100644
--- a/platform/server/os_server.cpp
+++ b/platform/server/os_server.cpp
@@ -26,13 +26,13 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "servers/visual/visual_server_raster.h"
-#include "servers/visual/rasterizer_dummy.h"
 #include "os_server.h"
-#include <stdio.h>
-#include <stdlib.h>
 #include "print_string.h"
 #include "servers/physics/physics_server_sw.h"
+#include "servers/visual/rasterizer_dummy.h"
+#include "servers/visual/visual_server_raster.h"
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "main/main.h"
 
@@ -42,61 +42,58 @@ int OS_Server::get_video_driver_count() const {
 
 	return 1;
 }
-const char * OS_Server::get_video_driver_name(int p_driver) const {
+const char *OS_Server::get_video_driver_name(int p_driver) const {
 
 	return "Dummy";
 }
 OS::VideoMode OS_Server::get_default_video_mode() const {
 
-	return OS::VideoMode(800,600,false);
+	return OS::VideoMode(800, 600, false);
 }
 
-void OS_Server::initialize(const VideoMode& p_desired,int p_video_driver,int p_audio_driver) {
+void 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;
-	main_loop=NULL;
+	args = OS::get_singleton()->get_cmdline_args();
+	current_videomode = p_desired;
+	main_loop = NULL;
 
-	rasterizer = memnew( RasterizerDummy );
+	rasterizer = memnew(RasterizerDummy);
 
-	visual_server = memnew( VisualServerRaster(rasterizer) );
+	visual_server = memnew(VisualServerRaster(rasterizer));
 
 	AudioDriverManagerSW::get_driver(p_audio_driver)->set_singleton();
 
-	if (AudioDriverManagerSW::get_driver(p_audio_driver)->init()!=OK) {
+	if (AudioDriverManagerSW::get_driver(p_audio_driver)->init() != OK) {
 
 		ERR_PRINT("Initializing audio failed.");
 	}
 
-	sample_manager = memnew( SampleManagerMallocSW );
-	audio_server = memnew( AudioServerSW(sample_manager) );
+	sample_manager = memnew(SampleManagerMallocSW);
+	audio_server = memnew(AudioServerSW(sample_manager));
 	audio_server->init();
-	spatial_sound_server = memnew( SpatialSoundServerSW );
+	spatial_sound_server = memnew(SpatialSoundServerSW);
 	spatial_sound_server->init();
-	spatial_sound_2d_server = memnew( SpatialSound2DServerSW );
+	spatial_sound_2d_server = memnew(SpatialSound2DServerSW);
 	spatial_sound_2d_server->init();
 
-
 	ERR_FAIL_COND(!visual_server);
 
 	visual_server->init();
 	//
-	physics_server = memnew( PhysicsServerSW );
+	physics_server = memnew(PhysicsServerSW);
 	physics_server->init();
-	physics_2d_server = memnew( Physics2DServerSW );
+	physics_2d_server = memnew(Physics2DServerSW);
 	physics_2d_server->init();
 
-	input = memnew( InputDefault );
+	input = memnew(InputDefault);
 
 	_ensure_data_dir();
-
-
 }
 void OS_Server::finalize() {
 
-	if(main_loop)
+	if (main_loop)
 		memdelete(main_loop);
-	main_loop=NULL;
+	main_loop = NULL;
 
 	spatial_sound_server->finish();
 	memdelete(spatial_sound_server);
@@ -104,8 +101,8 @@ void OS_Server::finalize() {
 	memdelete(spatial_sound_2d_server);
 
 	//if (debugger_connection_console) {
-//		memdelete(debugger_connection_console);
-//}
+	//		memdelete(debugger_connection_console);
+	//}
 
 	memdelete(sample_manager);
 
@@ -128,12 +125,10 @@ 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;
+	grab = p_grab;
 }
 bool OS_Server::is_mouse_grab_enabled() const {
 
@@ -150,14 +145,10 @@ Point2 OS_Server::get_mouse_pos() const {
 	return Point2();
 }
 
-void OS_Server::set_window_title(const String& p_title) {
-
-
+void OS_Server::set_window_title(const String &p_title) {
 }
 
-void OS_Server::set_video_mode(const VideoMode& p_video_mode,int p_screen) {
-
-
+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 {
 
@@ -166,15 +157,12 @@ OS::VideoMode OS_Server::get_video_mode(int p_screen) const {
 
 Size2 OS_Server::get_window_size() const {
 
-	return Vector2(current_videomode.width,current_videomode.height)	;
+	return Vector2(current_videomode.width, current_videomode.height);
 }
 
-void OS_Server::get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen) const {
-
-
+void OS_Server::get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen) const {
 }
 
-
 MainLoop *OS_Server::get_main_loop() const {
 
 	return main_loop;
@@ -184,12 +172,12 @@ void OS_Server::delete_main_loop() {
 
 	if (main_loop)
 		memdelete(main_loop);
-	main_loop=NULL;
+	main_loop = NULL;
 }
 
-void OS_Server::set_main_loop( MainLoop * p_main_loop ) {
+void OS_Server::set_main_loop(MainLoop *p_main_loop) {
 
-	main_loop=p_main_loop;
+	main_loop = p_main_loop;
 	input->set_main_loop(p_main_loop);
 }
 
@@ -198,21 +186,15 @@ bool OS_Server::can_draw() const {
 	return false; //can never draw
 };
 
-
 String OS_Server::get_name() {
 
 	return "Server";
 }
 
-
-
 void OS_Server::move_window_to_foreground() {
-
 }
 
 void OS_Server::set_cursor_shape(CursorShape p_shape) {
-
-
 }
 
 void OS_Server::run() {
@@ -226,7 +208,7 @@ void OS_Server::run() {
 
 	while (!force_quit) {
 
-		if (Main::iteration()==true)
+		if (Main::iteration() == true)
 			break;
 	};
 
@@ -237,6 +219,5 @@ OS_Server::OS_Server() {
 
 	AudioDriverManagerSW::add_driver(&driver_dummy);
 	//adriver here
-	grab=false;
-
+	grab = false;
 };