mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16473) -Fix [FS#2934](r16442): show all non-effect vehicles in the minimap, not only effect vehicles

release/1.0
smatz 2009-05-30 20:44:34 +00:00
parent 8c11d612e4
commit 34f6b8614e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/smallmap_gui.cpp
View File

@ -20,7 +20,6 @@
#include "vehicle_base.h" #include "vehicle_base.h"
#include "sound_func.h" #include "sound_func.h"
#include "window_func.h" #include "window_func.h"
#include "effectvehicle_base.h"
#include "table/strings.h" #include "table/strings.h"
#include "table/sprites.h" #include "table/sprites.h"
@ -740,9 +739,13 @@ public:
/* draw vehicles? */ /* draw vehicles? */
if (this->map_type == SMT_CONTOUR || this->map_type == SMT_VEHICLES) { if (this->map_type == SMT_CONTOUR || this->map_type == SMT_VEHICLES) {
EffectVehicle *v; Vehicle *v;
FOR_ALL_EFFECTVEHICLES(v) { bool skip;
if ((v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) == 0) { byte colour;
FOR_ALL_VEHICLES(v) {
if (v->type != VEH_EFFECT &&
(v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) == 0) {
/* Remap into flat coordinates. */ /* Remap into flat coordinates. */
Point pt = RemapCoords( Point pt = RemapCoords(
v->x_pos / TILE_SIZE - this->scroll_x / TILE_SIZE, // divide each one separately because (a-b)/c != a/c-b/c in integer world v->x_pos / TILE_SIZE - this->scroll_x / TILE_SIZE, // divide each one separately because (a-b)/c != a/c-b/c in integer world
@ -756,7 +759,7 @@ public:
if (!IsInsideMM(y, 0, dpi->height)) continue; if (!IsInsideMM(y, 0, dpi->height)) continue;
/* Default is to draw both pixels. */ /* Default is to draw both pixels. */
bool skip = false; skip = false;
/* Offset X coordinate */ /* Offset X coordinate */
x -= this->subscroll + 3 + dpi->left; x -= this->subscroll + 3 + dpi->left;
@ -773,7 +776,7 @@ public:
} }
/* Calculate pointer to pixel and the colour */ /* Calculate pointer to pixel and the colour */
byte colour = (this->map_type == SMT_VEHICLES) ? _vehicle_type_colours[v->type] : 0xF; colour = (this->map_type == SMT_VEHICLES) ? _vehicle_type_colours[v->type] : 0xF;
/* And draw either one or two pixels depending on clipping */ /* And draw either one or two pixels depending on clipping */
blitter->SetPixel(dpi->dst_ptr, x, y, colour); blitter->SetPixel(dpi->dst_ptr, x, y, colour);