diff options
Diffstat (limited to 'src/group.h')
-rw-r--r-- | src/group.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/group.h b/src/group.h index 7c0e1c9ac..297b02b4d 100644 --- a/src/group.h +++ b/src/group.h @@ -76,19 +76,7 @@ static inline uint GetGroupArraySize(void) * @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(PlayerID p, GroupID id_g, EngineID id_e) -{ - if (IsValidGroupID(id_g)) return GetGroup(id_g)->num_engines[id_e]; - - uint num = GetPlayer(p)->num_engines[id_e]; - if (!IsDefaultGroupID(id_g)) return num; - - const Group *g; - FOR_ALL_GROUPS(g) { - if (g->owner == p) num -= g->num_engines[id_e]; - } - return num; -} +uint GetGroupNumEngines(PlayerID p, GroupID id_g, EngineID id_e); static inline void IncreaseGroupNumVehicle(GroupID id_g) { @@ -105,6 +93,6 @@ void InitializeGroup(); void SetTrainGroupID(Vehicle *v, GroupID grp); void UpdateTrainGroupID(Vehicle *v); void RemoveVehicleFromGroup(const Vehicle *v); -void RemoveAllGroupsForPlayer(const Player *p); +void RemoveAllGroupsForPlayer(const PlayerID p); #endif /* GROUP_H */ |