cpp/openttd-patchpack/source Changeset - r18428:50916b734735

Changeset - r18428:50916b734735

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

frosch - 13 years ago 2011-11-20 14:39:12
frosch@openttd.org

(svn r23282) -Fix [FS#4844] (r23212): CmdRemoveAllVehiclesGroup() was not passed the vehicle type in all cases, but the type is actually not needed.

2 files changed with 5 insertions and 6 deletions:

src/group_cmd.cpp

src/group_gui.cpp

0 comments (0 inline, 0 general)

src/group_cmd.cpp

➞

Show inline comments

@@ @@ -486,7 +486,7 @@ CommandCost CmdAddSharedVehicleGroup(Til @@
  * @param flags type of operation
  * @param p1   index of group array
  * - p1 bit 0-15 : GroupID
- * @param p2   type of vehicles
+ * @param p2   unused
  * @param text unused
  * @return the cost of this operation or an error
  */
@@ @@ -494,16 +494,15 @@ CommandCost CmdRemoveAllVehiclesGroup(Ti @@
+{
 	GroupID old_g = p1;
 	Group *g = Group::GetIfValid(old_g);
 	VehicleType type = Extract<VehicleType, 0, 3>(p2);
-	if (g == NULL || g->owner != _current_company || !IsCompanyBuildableVehicleType(type)) return CMD_ERROR;
 	if (g == NULL || g->owner != _current_company) return CMD_ERROR;
 	if (flags & DC_EXEC) {
 		Vehicle *v;
 		/* Find each Vehicle that belongs to the group old_g and add it to the default group */
 		FOR_ALL_VEHICLES(v) {
-			if (v->type == type && v->IsPrimaryVehicle()) {
 			if (v->IsPrimaryVehicle()) {
 				if (v->group_id != old_g) continue;
 				/* Add The Vehicle to the default group */
@@ @@ -511,7 +510,7 @@ CommandCost CmdRemoveAllVehiclesGroup(Ti @@
+			}
+		}
-		InvalidateWindowData(GetWindowClassForVehicleType(type), VehicleListIdentifier(VL_GROUP_LIST, type, _current_company).Pack());
+		InvalidateWindowData(GetWindowClassForVehicleType(g->vehicle_type), VehicleListIdentifier(VL_GROUP_LIST, g->vehicle_type, _current_company).Pack());
+	}
 	return CommandCost();

src/group_gui.cpp

➞

Show inline comments

@@ @@ -711,7 +711,7 @@ public: @@
 					case ADI_REMOVE_ALL: // Remove all Vehicles from the selected group
 						assert(Group::IsValidID(this->vli.index));
-						DoCommandP(0, this->vli.index, this->vli.vtype, CMD_REMOVE_ALL_VEHICLES_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES));
+						DoCommandP(0, this->vli.index, 0, CMD_REMOVE_ALL_VEHICLES_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES));
 						break;
 					default: NOT_REACHED();
+				}

0 comments (0 inline, 0 general)