From 0d58c4f8ab1d174c808c77bf94342c91f6e0c443 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sat, 13 Oct 2012 10:51:48 +0000
Subject: Draw zone colors and background texture on the galactic map.

---
 src/filesystem/inistream.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/filesystem')

diff --git a/src/filesystem/inistream.cc b/src/filesystem/inistream.cc
index d07745b..54400d0 100644
--- a/src/filesystem/inistream.cc
+++ b/src/filesystem/inistream.cc
@@ -209,6 +209,8 @@ bool IniStream::got_key_color(const char * keylabel, math::Color & color)
 			if ((r > 1.0f) || (g > 1.0f) || (b > 1.0f)) {
 				if (is >> a) {
 					a /= 255.0f;
+				} else {
+					a = 1.0f;
 				}
 				r /= 255.0f;
 				g /= 255.0f;
@@ -218,9 +220,9 @@ bool IniStream::got_key_color(const char * keylabel, math::Color & color)
 					a = 1.0f;
 				}
 			}
-			color = math::Color(r, g, b, a);
+			color.assign(r, g, b, a);
 		} else {
-			color = math::Color();
+			color.assign(1.0f, 1.0f);
 		}
 		return true;
 	} else {
-- 
cgit v1.2.3