CODE: Do not store passenger destination statuses as colours

This halves required memory for storing pax destination statuses per city,
and also avoids calling color_idx_to_rgb() during (sync_)step

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@11708 8aca7d54-2c30-db11-9de9-000461428c89

Author: ceeac

src/simutrans/gui/city_info.cc

@@ -37,7 +37,7 @@ class gui_city_minimap_t : public gui_world_component_t
 	uint32 pax_destinations_last_change;
 
 	void init_pax_dest( array2d_tpl<PIXVAL> &pax_dest );
-	void add_pax_dest( array2d_tpl<PIXVAL> &pax_dest, const sparse_tpl<PIXVAL>* city_pax_dest );
+	void add_pax_dest( array2d_tpl<PIXVAL> &pax_dest, const sparse_tpl<pax_dest_status_t> &city_pax_dest);
 
 public:
 	gui_city_minimap_t(stadt_t* city) : city(city),
@@ -335,21 +335,30 @@ void gui_city_minimap_t::init_pax_dest( array2d_tpl<PIXVAL> &pax_dest )
 }
 
 
-void gui_city_minimap_t::add_pax_dest( array2d_tpl<PIXVAL> &pax_dest, const sparse_tpl<PIXVAL>* city_pax_dest )
+void gui_city_minimap_t::add_pax_dest( array2d_tpl<PIXVAL> &pax_dest, const sparse_tpl<pax_dest_status_t> &city_pax_dest)
 {
-	PIXVAL color;
+	pax_dest_status_t dst_status;
 	koord pos;
 	// how large the box in the world?
 	const sint16 dd_x = 1+(minimaps_size.w-1)/PAX_DESTINATIONS_SIZE;
 	const sint16 dd_y = 1+(minimaps_size.h-1)/PAX_DESTINATIONS_SIZE;
 
-	for(  uint16 i = 0;  i < city_pax_dest->get_data_count();  i++  ) {
-		city_pax_dest->get_nonzero(i, pos, color);
+	const PIXVAL city_dest_color_lut[4] = {
+		color_idx_to_rgb(pax_dest_status_colors[0]),
+		color_idx_to_rgb(pax_dest_status_colors[1]),
+		color_idx_to_rgb(pax_dest_status_colors[2]),
+		color_idx_to_rgb(pax_dest_status_colors[3])
+	};
+
+	for(  uint16 i = 0;  i < city_pax_dest.get_data_count();  i++  ) {
+		city_pax_dest.get_nonzero(i, pos, dst_status);
 
 		// calculate display position according to minimap size
 		const sint16 x0 = (pos.x*minimaps_size.w)/PAX_DESTINATIONS_SIZE;
 		const sint16 y0 = (pos.y*minimaps_size.h)/PAX_DESTINATIONS_SIZE;
 
+		const PIXVAL color = city_dest_color_lut[dst_status];
+
 		for(  sint32 y=0;  y<dd_y  &&  y+y0<minimaps_size.h;  y++  ) {
 			for(  sint32 x=0;  x<dd_x  &&  x+x0<minimaps_size.w;  x++  ) {
 				pax_dest.at( x+x0, y+y0 ) = color;

src/simutrans/gui/minimap.cc

@@ -1312,19 +1312,20 @@ void minimap_t::draw(scr_coord pos)
 		}
 		else if(  pax_destinations_last_change < current_pax_destinations  ) {
 			// new pax_dest in city.
-			const sparse_tpl<PIXVAL> *pax_dests = selected_city->get_pax_destinations_new();
+			const sparse_tpl<pax_dest_status_t> &pax_dests = selected_city->get_pax_destinations_new();
 			koord pos, min, max;
-			PIXVAL color;
-			for(  uint16 i = 0;  i < pax_dests->get_data_count();  i++  ) {
-				pax_dests->get_nonzero( i, pos, color );
+			pax_dest_status_t dst_status;
+
+			for(  uint16 i = 0;  i < pax_dests.get_data_count();  i++  ) {
+				pax_dests.get_nonzero( i, pos, dst_status);
 				min = koord((pos.x*world->get_size().x)/PAX_DESTINATIONS_SIZE,
 				            (pos.y*world->get_size().y)/PAX_DESTINATIONS_SIZE);
 				max = koord(((pos.x+1)*world->get_size().x)/PAX_DESTINATIONS_SIZE,
 				            ((pos.y+1)*world->get_size().y)/PAX_DESTINATIONS_SIZE);
 				pos = min;
 				do {
 					do {
-						set_map_color(pos, color);
+						set_map_color(pos, pax_dest_status_colors[dst_status]);
 						pos.y++;
 					} while(pos.y < max.y);
 					pos.x++;

src/simutrans/tpl/sparse_tpl.h

@@ -92,7 +92,7 @@ class sparse_tpl
 	void get_nonzero( uint16 index, koord& pos, T& value ) const {
 		if(  index > data_count  ) {
 			pos = koord::invalid;
-			value = 0;
+			value = T(0);
 			return;
 		}
 		value = data[index];

src/simutrans/world/simcity.cc

@@ -1357,25 +1357,27 @@ void stadt_t::rotate90( const sint16 y_size )
 	best_strasse.reset(pos);
 	best_haus.reset(pos);
 	// townhall position may be changed a little!
-	sparse_tpl<PIXVAL> pax_destinations_temp(koord( PAX_DESTINATIONS_SIZE, PAX_DESTINATIONS_SIZE ));
+	sparse_tpl<pax_dest_status_t> pax_destinations_temp(koord( PAX_DESTINATIONS_SIZE, PAX_DESTINATIONS_SIZE ));
 
-	PIXVAL color;
 	koord pos;
 	for( uint16 i = 0; i < pax_destinations_new.get_data_count(); i++ ) {
-		pax_destinations_new.get_nonzero(i, pos, color);
-		assert( color != 0 );
-		pax_destinations_temp.set( PAX_DESTINATIONS_SIZE-1-pos.y, pos.x, color );
+		pax_dest_status_t dst_status;
+		pax_destinations_new.get_nonzero(i, pos, dst_status);
+		assert( dst_status != 0 );
+		pax_destinations_temp.set( PAX_DESTINATIONS_SIZE-1-pos.y, pos.x, dst_status );
 	}
-	swap<PIXVAL>( pax_destinations_temp, pax_destinations_new );
+	swap<pax_dest_status_t>( pax_destinations_temp, pax_destinations_new );
 
 	pax_destinations_temp.clear();
 	for( uint16 i = 0; i < pax_destinations_old.get_data_count(); i++ ) {
-		pax_destinations_old.get_nonzero(i, pos, color);
-		assert( color != 0 );
-		pax_destinations_temp.set( PAX_DESTINATIONS_SIZE-1-pos.y, pos.x, color );
+		pax_dest_status_t dst_status;
+		pax_destinations_old.get_nonzero(i, pos, dst_status);
+		assert( dst_status != 0 );
+		pax_destinations_temp.set( PAX_DESTINATIONS_SIZE-1-pos.y, pos.x, dst_status );
 	}
+	swap<pax_dest_status_t>( pax_destinations_temp, pax_destinations_old );
+
 	pax_destinations_new_change ++;
-	swap<PIXVAL>( pax_destinations_temp, pax_destinations_old );
 }
 
 
@@ -1634,7 +1636,7 @@ void stadt_t::city_growth_monthly(uint32 const month)
 
 void stadt_t::new_month( bool recalc_destinations )
 {
-	swap<PIXVAL>( pax_destinations_old, pax_destinations_new );
+	swap<pax_dest_status_t>( pax_destinations_old, pax_destinations_new );
 	pax_destinations_new.clear();
 	pax_destinations_new_change = 0;
 
@@ -1904,7 +1906,7 @@ void stadt_t::step_passagiere()
 				city_history_month[0][history_type + HIST_OFFSET_TRANSPORTED] += pax_left_to_do;
 
 				// destination logged
-				merke_passagier_ziel(dest_pos, color_idx_to_rgb(COL_YELLOW));
+				merke_passagier_ziel(dest_pos, PAX_DEST_STATUS_REACHABLE);
 			}
 			else if(  route_result==haltestelle_t::ROUTE_WALK  ) {
 				if(  factory_entry  ) {
@@ -1932,21 +1934,20 @@ void stadt_t::step_passagiere()
 					// all routes to goal are overcrowded -> register at first stop (closest)
 					for(halthandle_t const s : start_halts) {
 						s->add_pax_unhappy(pax_left_to_do);
-						merke_passagier_ziel(dest_pos, color_idx_to_rgb(COL_ORANGE));
 						break;
 					}
 				}
 
 				// destination logged
-				merke_passagier_ziel(dest_pos, color_idx_to_rgb(COL_ORANGE));
+				merke_passagier_ziel(dest_pos, PAX_DEST_STATUS_ROUTE_OVERCROWDED);
 			}
 			else if (  route_result == haltestelle_t::NO_ROUTE  ) {
 				// since there is no route from any start halt -> register no route at first halts (closest)
 				for(halthandle_t const s : start_halts) {
 					s->add_pax_no_route(pax_left_to_do);
 					break;
 				}
-				merke_passagier_ziel(dest_pos, color_idx_to_rgb(COL_DARK_ORANGE));
+				merke_passagier_ziel(dest_pos, PAX_DEST_STATUS_NO_ROUTE);
 #ifdef DESTINATION_CITYCARS
 				//citycars with destination
 				generate_private_cars( origin_pos, dest_pos );
@@ -2129,7 +2130,7 @@ void stadt_t::step_passagiere()
 		//citycars with destination
 		generate_private_cars( origin_pos, ziel );
 #endif
-		merke_passagier_ziel(ziel, color_idx_to_rgb(COL_ORANGE));
+		merke_passagier_ziel(ziel, PAX_DEST_STATUS_ROUTE_OVERCROWDED);
 		// we show unhappy instead no route for destination stop
 	}
 }
@@ -2231,14 +2232,14 @@ koord stadt_t::find_destination(factory_set_t &target_factories, const sint64 ge
 }
 
 
-void stadt_t::merke_passagier_ziel(koord k, PIXVAL color)
+void stadt_t::merke_passagier_ziel(koord k, pax_dest_status_t status)
 {
 	const koord p = koord(
 		((k.x * PAX_DESTINATIONS_SIZE) / welt->get_size().x) & (PAX_DESTINATIONS_SIZE-1),
 		((k.y * PAX_DESTINATIONS_SIZE) / welt->get_size().y) & (PAX_DESTINATIONS_SIZE-1)
 	);
 	pax_destinations_new_change ++;
-	pax_destinations_new.set(p, color);
+	pax_destinations_new.set(p, status);
 }
 
 

src/simutrans/world/simcity.h

@@ -72,6 +72,27 @@ static const uint32 GENERATE_RATIO_PASS = 3;
 // Mail generation ratio. This many parts to passenger generation ratio parts.
 static const uint32 GENERATE_RATIO_MAIL = 1;
 
+
+/// When a passenger attempts to travel from a city,
+/// this is the reachability status of the desination
+/// (as shown in the city info window)
+/// @sa haltestelle_t::routing_result_flags
+enum pax_dest_status_t : uint8
+{
+	PAX_DEST_STATUS_REACHABLE         = 1,
+	PAX_DEST_STATUS_ROUTE_OVERCROWDED = 2,
+	PAX_DEST_STATUS_NO_ROUTE          = 3
+};
+
+
+static const uint8 pax_dest_status_colors[4] = {
+	0,
+	COL_YELLOW,      // OK/reachable
+	COL_ORANGE,      // route overcrowded
+	COL_DARK_ORANGE, // no route
+};
+
+
 /**
  * Die Objecte der Klasse stadt_t bilden die Staedte in Simu. Sie
  * wachsen automatisch.
@@ -127,8 +148,8 @@ class stadt_t
 
 	weighted_vector_tpl <gebaeude_t *> buildings;
 
-	sparse_tpl<PIXVAL> pax_destinations_old;
-	sparse_tpl<PIXVAL> pax_destinations_new;
+	sparse_tpl<pax_dest_status_t> pax_destinations_old;
+	sparse_tpl<pax_dest_status_t> pax_destinations_new;
 
 	// this counter will increment by one for every change => dialogs can question, if they need to update map
 	uint32 pax_destinations_new_change;
@@ -346,7 +367,7 @@ class stadt_t
 	/**
 	 * ein Passagierziel in die Zielkarte eintragen
 	 */
-	void merke_passagier_ziel(koord ziel, PIXVAL color);
+	void merke_passagier_ziel(koord ziel, pax_dest_status_t status);
 
 	/**
 	 * baut Spezialgebaeude, z.B Stadion
@@ -465,10 +486,10 @@ class stadt_t
 	koord get_zufallspunkt() const;
 
 	/// @returns passenger destination statistics for the last month
-	const sparse_tpl<PIXVAL>* get_pax_destinations_old() const { return &pax_destinations_old; }
+	const sparse_tpl<pax_dest_status_t> &get_pax_destinations_old() const { return pax_destinations_old; }
 
 	/// @returns passenger destination statistics for the current month
-	const sparse_tpl<PIXVAL>* get_pax_destinations_new() const { return &pax_destinations_new; }
+	const sparse_tpl<pax_dest_status_t> &get_pax_destinations_new() const { return pax_destinations_new; }
 
 	/* this counter will increment by one for every change
 	 * => dialogs can question, if they need to update map