read the splash font color from the gui style file. This is a bit of a

gimmick, but it may be nice to adjust the font color to match the splash
image, e.g. to make it darker for dark images, etc.

diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx
index c0bc348c949208d9639a1702584e4177fbb2a24d..f33baf3e10d6ab206d2f375ef6c2cab59be4a4ef 100644 (file)
--- a/src/Main/splash.cxx
+++ b/src/Main/splash.cxx
@@ -46,6 +46,8 @@
 #include <simgear/math/sg_random.h>
 #include <simgear/misc/sg_path.hxx>
 
+#include <GUI/new_gui.hxx>
+
 #include "globals.hxx"
 #include "fg_props.hxx"
 #include "splash.hxx"
@@ -197,7 +199,10 @@ void fgSplashUpdate ( float alpha ) {
         float left, right, bot, top;
 
         info.begin();
-        glColor4f(1.0, 0.9, 0.0, alpha);
+        FGColor c(1.0, 0.9, 0.0);
+        c.merge(fgGetNode("/sim/gui/colors/splash"));
+        glColor4f(c.red(), c.green(), c.blue(), alpha);
+
         font.getBBox(progress_text, fontsize, 0, &left, &right, &bot, &top);
         info.start2f((screen_width - right) / 2.0, 10.0 - bot);
         info.puts(progress_text);