dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r27090) -Codechange [FS#5976]: Simplify some hierarchical groups code. (Juanjo)

Browse Source
This commit is contained in:
frosch
2014-12-24 16:49:57 +00:00
parent c5ea52027c
commit fbd7b7ce33
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/group_cmd.cpp
View File

@@ -404,11 +404,7 @@ CommandCost CmdAlterGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
/* Ensure request parent isn't child of group. /* Ensure request parent isn't child of group.
* This is the only place that infinite loops are prevented. */ * This is the only place that infinite loops are prevented. */
const Group *looptest = pg; if (GroupIsInGroup(pg->index, g->index)) return CMD_ERROR;
while (looptest->parent != INVALID_GROUP) {
if (looptest->parent == g->index) return CMD_ERROR;
looptest = Group::Get(looptest->parent);
}
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
@@ -688,7 +684,7 @@ void UpdateTrainGroupID(Train *v)
/** /**
* Get the number of engines with EngineID id_e in the group with GroupID * Get the number of engines with EngineID id_e in the group with GroupID
* id_g * id_g and its sub-groups.
* @param company The company the group belongs to * @param company The company the group belongs to
* @param id_g The GroupID of the group used * @param id_g The GroupID of the group used
* @param id_e The EngineID of the engine to count * @param id_e The EngineID of the engine to count
@@ -723,10 +719,7 @@ void RemoveAllGroupsForCompany(const CompanyID company)
*/ */
bool GroupIsInGroup(GroupID search, GroupID group) bool GroupIsInGroup(GroupID search, GroupID group)
{ {
if (search == NEW_GROUP || if (!Group::IsValidID(search)) return search == group;
search == ALL_GROUP ||
search == DEFAULT_GROUP ||
search == INVALID_GROUP) return search == group;
do { do {
if (search == group) return true; if (search == group) return true;