mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Change: Use selected group as parent when creating a new group. (#7224)

pull/7233/head
PeterN 2019-02-15 18:43:33 +00:00 committed by GitHub
parent 57734fd85d
commit 3a4b6b476b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/group_cmd.cpp
View File

@ -311,7 +311,7 @@ Group::~Group()
* @param tile unused * @param tile unused
* @param flags type of operation * @param flags type of operation
* @param p1 vehicle type * @param p1 vehicle type
* @param p2 unused * @param p2 parent groupid
* @param text unused * @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
@ -322,15 +322,27 @@ CommandCost CmdCreateGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
if (!Group::CanAllocateItem()) return CMD_ERROR; if (!Group::CanAllocateItem()) return CMD_ERROR;
const Group *pg = Group::GetIfValid(GB(p2, 0, 16));
if (pg != NULL) {
if (pg->owner != _current_company) return CMD_ERROR;
if (pg->vehicle_type != vt) return CMD_ERROR;
}
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
Group *g = new Group(_current_company); Group *g = new Group(_current_company);
g->replace_protection = false; g->replace_protection = false;
g->vehicle_type = vt; g->vehicle_type = vt;
g->parent = INVALID_GROUP; g->parent = INVALID_GROUP;
if (pg == NULL) {
const Company *c = Company::Get(_current_company); const Company *c = Company::Get(_current_company);
g->livery.colour1 = c->livery[LS_DEFAULT].colour1; g->livery.colour1 = c->livery[LS_DEFAULT].colour1;
g->livery.colour2 = c->livery[LS_DEFAULT].colour2; g->livery.colour2 = c->livery[LS_DEFAULT].colour2;
} else {
g->parent = pg->index;
g->livery.colour1 = pg->livery.colour1;
g->livery.colour2 = pg->livery.colour2;
}
_new_group_id = g->index; _new_group_id = g->index;

2
src/group_gui.cpp
View File

@ -687,7 +687,7 @@ public:
} }
case WID_GL_CREATE_GROUP: { // Create a new group case WID_GL_CREATE_GROUP: { // Create a new group
DoCommandP(0, this->vli.vtype, 0, CMD_CREATE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_CREATE), CcCreateGroup); DoCommandP(0, this->vli.vtype, this->vli.index, CMD_CREATE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_CREATE), CcCreateGroup);
break; break;
} }