cpp/openttd-patchpack/source Changeset - r13310:5d9e51569662

Changeset - r13310:5d9e51569662

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 15 years ago 2009-10-20 20:57:30
smatz@openttd.org

(svn r17829) -Codechange: move code used for adding vehicles and town names to minimap to separate functions

1 file changed with 82 insertions and 68 deletions:

src/smallmap_gui.cpp

0 comments (0 inline, 0 general)

src/smallmap_gui.cpp

➞

Show inline comments

@@ @@ -637,6 +637,84 @@ class SmallMapWindow : public Window { @@
+	}
 	/**
 	 * Adds vehicles to the smallmap.
 	 * @param dpi the part of the smallmap to be drawn into
 	 * @param blitter current blitter
 	 */
 	inline void DrawVehicles(DrawPixelInfo *dpi, Blitter *blitter)
+	{
 		const Vehicle *v;
 		FOR_ALL_VEHICLES(v) {
 			if (v->type == VEH_EFFECT) continue;
 			if (v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) continue;
 			/* Remap into flat coordinates. */
 			Point pt = RemapCoords(
 					this->RemapX(v->x_pos / TILE_SIZE),
 					this->RemapY(v->y_pos / TILE_SIZE),
 );
 			int x = pt.x;
 			int y = pt.y;
 			/* Check if y is out of bounds? */
 			y -= dpi->top;
 			if (!IsInsideMM(y, 0, dpi->height)) continue;
 			/* Default is to draw both pixels. */
 			bool skip = false;
 			/* Offset X coordinate */
 			x -= this->subscroll + 3 + dpi->left;
 			if (x < 0) {
 				/* if x+1 is 0, that means we're on the very left edge,
 				 *  and should thus only draw a single pixel */
 				if (++x != 0) continue;
 				skip = true;
 			} else if (x >= dpi->width - 1) {
 				/* Check if we're at the very right edge, and if so draw only a single pixel */
 				if (x != dpi->width - 1) continue;
 				skip = true;
+			}
 			/* Calculate pointer to pixel and the colour */
 			byte colour = (this->map_type == SMT_VEHICLES) ? _vehicle_type_colours[v->type] : 0xF;
 			/* And draw either one or two pixels depending on clipping */
 			blitter->SetPixel(dpi->dst_ptr, x, y, colour);
 			if (!skip) blitter->SetPixel(dpi->dst_ptr, x + 1, y, colour);
+		}
+	}
 	/**
 	 * Adds town names to the smallmap.
 	 * @param dpi the part of the smallmap to be drawn into
 	 */
 	inline void DrawTowns(DrawPixelInfo *dpi)
+	{
 		const Town *t;
 		FOR_ALL_TOWNS(t) {
 			/* Remap the town coordinate */
 			Point pt = RemapCoords(
 					this->RemapX(TileX(t->xy)),
 					this->RemapY(TileY(t->xy)),
 );
 			int x = pt.x - this->subscroll - (t->sign.width_small >> 1);
 			int y = pt.y;
 			/* Check if the town sign is within bounds */
 			if (x + t->sign.width_small > dpi->left &&
 					x < dpi->left + dpi->width &&
 					y + FONT_HEIGHT_SMALL > dpi->top &&
 					y < dpi->top + dpi->height) {
 				/* And draw it. */
 				SetDParam(0, t->index);
 				DrawString(x, x + t->sign.width_small, y, STR_SMALLMAP_TOWN);
+			}
+		}
+	}
 	/**
 	 * Draws the small map.
+	 *
 	 * Basically, the small map is draw column of pixels by column of pixels. The pixels
@@ @@ -739,75 +817,11 @@ class SmallMapWindow : public Window { @@
 			x += 2;
+		}
 		/* draw vehicles? */
 		if (this->map_type == SMT_CONTOUR || this->map_type == SMT_VEHICLES) {
 			Vehicle *v;
 			FOR_ALL_VEHICLES(v) {
 				if (v->type != VEH_EFFECT &&
 						(v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) == 0) {
 					/* Remap into flat coordinates. */
 					Point pt = RemapCoords(
 							this->RemapX(v->x_pos / TILE_SIZE),
 							this->RemapY(v->y_pos / TILE_SIZE),
 );
 					x = pt.x;
 					y = pt.y;
 					/* Check if y is out of bounds? */
 					y -= dpi->top;
 					if (!IsInsideMM(y, 0, dpi->height)) continue;
 					/* Default is to draw both pixels. */
 					bool skip = false;
 					/* Offset X coordinate */
 					x -= this->subscroll + 3 + dpi->left;
 		/* Draw vehicles */
 		if (this->map_type == SMT_CONTOUR || this->map_type == SMT_VEHICLES) this->DrawVehicles(dpi, blitter);
 					if (x < 0) {
 						/* if x+1 is 0, that means we're on the very left edge,
 						 *  and should thus only draw a single pixel */
 						if (++x != 0) continue;
 						skip = true;
 					} else if (x >= dpi->width - 1) {
 						/* Check if we're at the very right edge, and if so draw only a single pixel */
 						if (x != dpi->width - 1) continue;
 						skip = true;
+					}
 					/* Calculate pointer to pixel and the colour */
 					byte colour = (this->map_type == SMT_VEHICLES) ? _vehicle_type_colours[v->type] : 0xF;
 					/* And draw either one or two pixels depending on clipping */
 					blitter->SetPixel(dpi->dst_ptr, x, y, colour);
 					if (!skip) blitter->SetPixel(dpi->dst_ptr, x + 1, y, colour);
+				}
+			}
+		}
 		if (this->show_towns) {
 			const Town *t;
 			FOR_ALL_TOWNS(t) {
 				/* Remap the town coordinate */
 				Point pt = RemapCoords(
 						this->RemapX(TileX(t->xy)),
 						this->RemapY(TileY(t->xy)),
 );
 				x = pt.x - this->subscroll - (t->sign.width_small >> 1);
 				y = pt.y;
 				/* Check if the town sign is within bounds */
 				if (x + t->sign.width_small > dpi->left &&
 						x < dpi->left + dpi->width &&
 						y + FONT_HEIGHT_SMALL > dpi->top &&
 						y < dpi->top + dpi->height) {
 					/* And draw it. */
 					SetDParam(0, t->index);
 					DrawString(x, x + t->sign.width_small, y, STR_SMALLMAP_TOWN);
+				}
+			}
+		}
 		/* Draw town names */
 		if (this->show_towns) this->DrawTowns(dpi);
 		/* Find main viewport. */
 		ViewPort *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport;

0 comments (0 inline, 0 general)