From c004cc1fd9e706cbd9117e030c73f2043d7d974e Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 9 Jan 2008 21:27:39 +0000 Subject: (svn r11801) -Codechange: remove some unneeded includes from some header files. --- src/group_cmd.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/group_cmd.cpp') diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp index 3df9d0694..42ac7b58b 100644 --- a/src/group_cmd.cpp +++ b/src/group_cmd.cpp @@ -409,13 +409,26 @@ void UpdateTrainGroupID(Vehicle *v) InvalidateWindow(WC_REPLACE_VEHICLE, VEH_TRAIN); } +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; +} -void RemoveAllGroupsForPlayer(const Player *p) +void RemoveAllGroupsForPlayer(const PlayerID p) { Group *g; FOR_ALL_GROUPS(g) { - if (p->index == g->owner) delete g; + if (p == g->owner) delete g; } } -- cgit v1.2.3-70-g09d2