From b875124824794a7762414db76ed9f953b8ba320f Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Fri, 26 Dec 2008 12:21:48 +0000
Subject: default player settings in player.ini, palette  text colors, cleanups

---
 src/client/video.cc | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'src/client/video.cc')

diff --git a/src/client/video.cc b/src/client/video.cc
index 53e5dbc..1db1ba4 100644
--- a/src/client/video.cc
+++ b/src/client/video.cc
@@ -10,6 +10,7 @@
 #include "client/client.h"
 #include "render/render.h"
 #include "core/core.h"
+#include "core/gameserver.h"
 #include "filesystem/filesystem.h"
 #include "sys/sys.h"
 #include "ui/ui.h"
@@ -133,20 +134,17 @@ bool init()
 
 #endif // HAVE_DEBUG_MESSAGES
 
+	// set window caption
+	set_caption();
+
 	// save r_width and r_height variables
 	(*r_width) = width;
 	(*r_height) = height;
 
-	// set window caption
-	std::string version(core::name());
-	version += ' ';
-	version.append(core::version());
-	SDL_WM_SetCaption(version.c_str(), 0);
-
 	// resize user interface
 	ui::root()->set_size((float) width, (float) height);
 	ui::root()->event_resize();
-	
+
 	// to grab or not to grab
 	if (ui::console()->visible()) {
 		SDL_WM_GrabInput(SDL_GRAB_OFF);
@@ -158,12 +156,27 @@ bool init()
 
 	// initialize renderer
 	render::init(width,  height);
+
+	// apply render options
+	ui::root()->apply_render_options();
 	
 	view::init();
 
 	return true;
 }
 
+void set_caption()
+{
+	// set window caption
+	std::string version;
+	if (core::server() && core::server()->module()) {
+		version.assign(core::server()->module()->name());
+	} else {
+		version.assign(core::name() + ' ' + core::version());
+	}
+	SDL_WM_SetCaption(version.c_str(), 0);
+}
+
 void resize(int w, int h)
 {
 	if (fullscreen)
-- 
cgit v1.2.3