Draw zone colors and background texture on the galactic map.

1 files changed, 7 insertions, 6 deletions

diff --git a/src/client/galaxymapwidget.cc b/src/client/galaxymapwidget.cc
index be9a6e0..0cc04af 100644
--- a/src/client/galaxymapwidget.cc
+++ b/src/client/galaxymapwidget.cc
@@ -66,15 +66,15 @@ void GalaxyMapWidget::draw()
 		map_location[1] += (height() - map_size) * 0.5f;
 	}
 
-	// draw background
-	math::Vector2f background_size(map_size, map_size);
-	ui::Paint::draw_material(map_location, background_size, "ui/background");
+	// draw widget background
+	math::Vector2f background_size(map_size, map_size);	
+	ui::Paint::draw_bitmap(map_location, background_size, math::Color(), "bitmaps/ui/map_background");
 	
 	// number of squares in one grid segment
 	const float grid_size = 16.0f;
 	
 	// draw the grid itself
-	gl::color(0, 0, 0.8f);
+	gl::color(0, 0, 0.25f);
 	gl::begin(gl::Lines);
 	
 	for (float i = 0; i <= grid_size; i += 1.0f) {
@@ -135,10 +135,11 @@ void GalaxyMapWidget::draw()
 				draw_icon = false;
 			}
 		}
+		
 		// TODO draw a ship icon for current location
 		if (draw_icon) {
-			gl::begin(gl::Quads);
-
+			color.assign(zone->color());
+			
 			gl::color(color);
 			glTexCoord2f(0.0f, 0.0f);
 			gl::vertex(icon_location.x() - r, icon_location.y() - r);