(svn r11801) -Codechange: remove some unneeded includes from some header files.

1 files changed, 15 insertions, 2 deletions

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;
 	}
 }