Index: src/group.h =================================================================== --- src/group.h (revision 10990) +++ src/group.h (working copy) @@ -76,7 +76,7 @@ * @param id_e The EngineID of the engine to count * @return The number of engines with EngineID id_e in the group */ -static inline uint GetGroupNumEngines(GroupID id_g, EngineID id_e) +static inline uint GetGroupNumEngines(PlayerID p, GroupID id_g, EngineID id_e) { if (IsValidGroupID(id_g)) return GetGroup(id_g)->num_engines[id_e]; @@ -84,7 +84,9 @@ if (!IsDefaultGroupID(id_g)) return num; const Group *g; - FOR_ALL_GROUPS(g) num -= g->num_engines[id_e]; + FOR_ALL_GROUPS(g) { + if (g->owner == p) num -= g->num_engines[id_e]; + } return num; } Index: src/build_vehicle_gui.cpp =================================================================== --- src/build_vehicle_gui.cpp (revision 10990) +++ src/build_vehicle_gui.cpp (working copy) @@ -853,7 +853,8 @@ for (; min < max; min++, y += step_size) { const EngineID engine = eng_list[min]; - const uint num_engines = GetGroupNumEngines(selected_group, engine); + /* Note: num_engines is only used in the autoreplace GUI, so it is correct to use _local_player here. */ + const uint num_engines = GetGroupNumEngines(_local_player, selected_group, engine); SetDParam(0, engine); DrawString(x + x_offset, y, STR_ENGINE_NAME, engine == selected_id ? 0xC : 0x10); Index: src/autoreplace_gui.cpp =================================================================== --- src/autoreplace_gui.cpp (revision 10990) +++ src/autoreplace_gui.cpp (working copy) @@ -49,7 +49,7 @@ { Player *p = GetPlayer(_local_player); byte type = GetEngine(e)->type; - uint num_engines = GetGroupNumEngines(id_g, e); + uint num_engines = GetGroupNumEngines(_local_player, id_g, e); if (num_engines == 0 || p->num_engines[e] == 0) { /* We don't have any of this engine type. @@ -154,7 +154,7 @@ if (draw_left) { const GroupID selected_group = WP(w, replaceveh_d).sel_group; - const uint num_engines = GetGroupNumEngines(selected_group, e); + const uint num_engines = GetGroupNumEngines(_local_player, selected_group, e); /* Skip drawing the engines we don't have any of and haven't set for replacement */ if (num_engines == 0 && EngineReplacementForPlayer(GetPlayer(_local_player), e, selected_group) == INVALID_ENGINE) continue;