summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-05-30 20:44:34 +0000
committersmatz <smatz@openttd.org>2009-05-30 20:44:34 +0000
commit34f6b8614e42624a6abaa1e3da69c80f22874bbb (patch)
treeeff021ba550fd83a41855100a78c6eded5b8ae68
parent8c11d612e44c30e124881ca47e15eda9ef0c5491 (diff)
downloadopenttd-34f6b8614e42624a6abaa1e3da69c80f22874bbb.tar.xz
(svn r16473) -Fix [FS#2934](r16442): show all non-effect vehicles in the minimap, not only effect vehicles
-rw-r--r--src/smallmap_gui.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 1692ee467..1e397eb31 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -20,7 +20,6 @@
#include "vehicle_base.h"
#include "sound_func.h"
#include "window_func.h"
-#include "effectvehicle_base.h"
#include "table/strings.h"
#include "table/sprites.h"
@@ -740,9 +739,13 @@ public:
/* draw vehicles? */
if (this->map_type == SMT_CONTOUR || this->map_type == SMT_VEHICLES) {
- EffectVehicle *v;
- FOR_ALL_EFFECTVEHICLES(v) {
- if ((v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) == 0) {
+ Vehicle *v;
+ bool skip;
+ byte colour;
+
+ FOR_ALL_VEHICLES(v) {
+ if (v->type != VEH_EFFECT &&
+ (v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) == 0) {
/* Remap into flat coordinates. */
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
@@ -756,7 +759,7 @@ public:
if (!IsInsideMM(y, 0, dpi->height)) continue;
/* Default is to draw both pixels. */
- bool skip = false;
+ skip = false;
/* Offset X coordinate */
x -= this->subscroll + 3 + dpi->left;
@@ -773,7 +776,7 @@ public:
}
/* 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 */
blitter->SetPixel(dpi->dst_ptr, x, y, colour);