src/group_cmd.cpp
changeset 6671 1448c1051d40
parent 6667 dba8ef60ffd2
child 6773 bc98b0b16ec4
equal deleted inserted replaced
6670:f0300bf50643 6671:1448c1051d40
   203 {
   203 {
   204 	GroupID new_g = p1;
   204 	GroupID new_g = p1;
   205 
   205 
   206 	if (!IsValidVehicleID(p2) || (!IsValidGroupID(new_g) && !IsDefaultGroupID(new_g))) return CMD_ERROR;
   206 	if (!IsValidVehicleID(p2) || (!IsValidGroupID(new_g) && !IsDefaultGroupID(new_g))) return CMD_ERROR;
   207 
   207 
   208 	Group *g = GetGroup(new_g);
   208 	if (IsValidGroupID(new_g)) {
   209 	if (g->owner != _current_player) return CMD_ERROR;
   209 		Group *g = GetGroup(new_g);
       
   210 		if (g->owner != _current_player) return CMD_ERROR;
       
   211 	}
   210 
   212 
   211 	Vehicle *v = GetVehicle(p2);
   213 	Vehicle *v = GetVehicle(p2);
   212 	if (v->owner != _current_player || (v->type == VEH_TRAIN && !IsFrontEngine(v))) return CMD_ERROR;
   214 	if (v->owner != _current_player || (v->type == VEH_TRAIN && !IsFrontEngine(v))) return CMD_ERROR;
   213 
   215 
   214 	if (flags & DC_EXEC) {
   216 	if (flags & DC_EXEC) {