summaryrefslogtreecommitdiff
path: root/platform/server
diff options
context:
space:
mode:
authorHubert Jarosz <marqin.pl@gmail.com>2016-03-09 00:00:52 +0100
committerHubert Jarosz <marqin.pl@gmail.com>2016-03-09 00:00:52 +0100
commit4a4f2479146aa33e235ed57cde311efda68d3c8f (patch)
treecf91f2869ff8f058c6682569fb31e22e5ee736ad /platform/server
parent1dad6eca812e5c2e313b54265114de8a1d73d999 (diff)
remove trailing whitespace
Diffstat (limited to 'platform/server')
-rw-r--r--platform/server/godot_server.cpp8
-rw-r--r--platform/server/os_server.cpp18
-rw-r--r--platform/server/os_server.h14
3 files changed, 20 insertions, 20 deletions
diff --git a/platform/server/godot_server.cpp b/platform/server/godot_server.cpp
index db6c13633d..1c55c03bd7 100644
--- a/platform/server/godot_server.cpp
+++ b/platform/server/godot_server.cpp
@@ -30,16 +30,16 @@
#include "os_server.h"
int main(int argc, char* argv[]) {
-
+
OS_Server os;
-
+
Error err = Main::setup(argv[0],argc-1,&argv[1]);
if (err!=OK)
return 255;
-
+
if (Main::start())
os.run(); // it is actually the OS that decides how to run
Main::cleanup();
-
+
return os.get_exit_code();
}
diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp
index f042318f78..5404980ff3 100644
--- a/platform/server/os_server.cpp
+++ b/platform/server/os_server.cpp
@@ -56,7 +56,7 @@ void OS_Server::initialize(const VideoMode& p_desired,int p_video_driver,int p_a
args=OS::get_singleton()->get_cmdline_args();
current_videomode=p_desired;
main_loop=NULL;
-
+
rasterizer = memnew( RasterizerDummy );
visual_server = memnew( VisualServerRaster(rasterizer) );
@@ -76,7 +76,7 @@ void OS_Server::initialize(const VideoMode& p_desired,int p_video_driver,int p_a
spatial_sound_2d_server = memnew( SpatialSound2DServerSW );
spatial_sound_2d_server->init();
-
+
ERR_FAIL_COND(!visual_server);
visual_server->init();
@@ -90,7 +90,7 @@ void OS_Server::initialize(const VideoMode& p_desired,int p_video_driver,int p_a
_ensure_data_dir();
-
+
}
void OS_Server::finalize() {
@@ -115,7 +115,7 @@ void OS_Server::finalize() {
visual_server->finish();
memdelete(visual_server);
memdelete(rasterizer);
-
+
physics_server->finish();
memdelete(physics_server);
@@ -218,18 +218,18 @@ void OS_Server::set_cursor_shape(CursorShape p_shape) {
void OS_Server::run() {
force_quit = false;
-
+
if (!main_loop)
return;
-
+
main_loop->init();
-
+
while (!force_quit) {
-
+
if (Main::iteration()==true)
break;
};
-
+
main_loop->finish();
}
diff --git a/platform/server/os_server.h b/platform/server/os_server.h
index 2487c7b3fb..2081d5f2f4 100644
--- a/platform/server/os_server.h
+++ b/platform/server/os_server.h
@@ -55,11 +55,11 @@ class OS_Server : public OS_Unix {
VisualServer *visual_server;
VideoMode current_videomode;
List<String> args;
- MainLoop *main_loop;
+ MainLoop *main_loop;
AudioDriverDummy driver_dummy;
bool grab;
-
+
PhysicsServer *physics_server;
Physics2DServer *physics_2d_server;
@@ -80,13 +80,13 @@ class OS_Server : public OS_Unix {
protected:
virtual int get_video_driver_count() const;
- virtual const char * get_video_driver_name(int p_driver) const;
+ virtual const char * get_video_driver_name(int p_driver) const;
virtual VideoMode get_default_video_mode() const;
-
- virtual void initialize(const VideoMode& p_desired,int p_video_driver,int p_audio_driver);
+
+ virtual void 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 );
+ virtual void set_main_loop( MainLoop * p_main_loop );
public:
@@ -102,7 +102,7 @@ public:
virtual void set_window_title(const String& p_title);
virtual MainLoop *get_main_loop() const;
-
+
virtual bool can_draw() const;
virtual void set_video_mode(const VideoMode& p_video_mode,int p_screen=0);