cpp/openttd-patchpack/source Changeset - r10151:bd7d25dbc2ae

Changeset - r10151:bd7d25dbc2ae

Parent rev.

Child rev.

[Not reviewed]

master

0 9 0

smatz - 16 years ago 2008-09-15 22:58:41
smatz@openttd.org

(svn r14337) -Codechange: use CmdRename* and CMD_RENAME_* for vehicle, president and company renaming commands, too

9 files changed with 19 insertions and 19 deletions:

src/autoreplace_cmd.cpp

src/command.cpp

src/command_type.h

src/misc_cmd.cpp

src/order_cmd.cpp

src/player_gui.cpp

src/players.cpp

src/vehicle.cpp

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/autoreplace_cmd.cpp

➞

Show inline comments

@@ @@ -310,13 +310,13 @@ static CommandCost CopyHeadSpecificThing @@
 	/* Last do those things which do never fail (resp. we do not care about), but which are not undo-able */
 	if (cost.Succeeded() && old_head != new_head && (flags & DC_EXEC) != 0) {
 		/* Copy vehicle name */
 		if (old_head->name != NULL) {
 			_cmd_text = old_head->name;
-			DoCommand(0, new_head->index, 0, DC_EXEC | DC_AUTOREPLACE, CMD_NAME_VEHICLE);
+			DoCommand(0, new_head->index, 0, DC_EXEC | DC_AUTOREPLACE, CMD_RENAME_VEHICLE);
 			_cmd_text = NULL;
+		}
 		/* Copy other things which cannot be copied by a command and which shall not stay resetted from the build vehicle command */
 		new_head->CopyVehicleConfigAndStatistics(old_head);

src/command.cpp

➞

Show inline comments

@@ @@ -110,17 +110,17 @@ DEF_COMMAND(CmdSetPlayerColor); @@
 DEF_COMMAND(CmdIncreaseLoan);
 DEF_COMMAND(CmdDecreaseLoan);
 DEF_COMMAND(CmdWantEnginePreview);
-DEF_COMMAND(CmdNameVehicle);
+DEF_COMMAND(CmdRenameVehicle);
 DEF_COMMAND(CmdRenameEngine);
 DEF_COMMAND(CmdChangeCompanyName);
 DEF_COMMAND(CmdChangePresidentName);
 DEF_COMMAND(CmdRenameCompany);
 DEF_COMMAND(CmdRenamePresident);
 DEF_COMMAND(CmdRenameStation);
 DEF_COMMAND(CmdSellAircraft);
 DEF_COMMAND(CmdBuildAircraft);
 DEF_COMMAND(CmdSendAircraftToHangar);
@@ @@ -260,17 +260,17 @@ static const Command _command_proc_table @@
 	{CmdIncreaseLoan,                        0}, /* CMD_INCREASE_LOAN */
 	{CmdDecreaseLoan,                        0}, /* CMD_DECREASE_LOAN */
 	{CmdWantEnginePreview,                   0}, /* CMD_WANT_ENGINE_PREVIEW */
-	{CmdNameVehicle,                         0}, /* CMD_NAME_VEHICLE */
+	{CmdRenameVehicle,                       0}, /* CMD_RENAME_VEHICLE */
 	{CmdRenameEngine,                        0}, /* CMD_RENAME_ENGINE */
 	{CmdChangeCompanyName,                   0}, /* CMD_CHANGE_COMPANY_NAME */
 	{CmdChangePresidentName,                 0}, /* CMD_CHANGE_PRESIDENT_NAME */
 	{CmdRenameCompany,                       0}, /* CMD_RENAME_COMPANY */
 	{CmdRenamePresident,                     0}, /* CMD_RENAME_PRESIDENT */
 	{CmdRenameStation,                       0}, /* CMD_RENAME_STATION */
 	{CmdSellAircraft,                        0}, /* CMD_SELL_AIRCRAFT */
 	{CmdBuildAircraft,                       0}, /* CMD_BUILD_AIRCRAFT */

src/command_type.h

➞

Show inline comments

@@ @@ -206,16 +206,16 @@ enum { @@
 	CMD_INCREASE_LOAN,                ///< increase the loan from the bank
 	CMD_DECREASE_LOAN,                ///< decrease the loan from the bank
 	CMD_WANT_ENGINE_PREVIEW,          ///< confirm the preview of an engine
-	CMD_NAME_VEHICLE,                 ///< rename a whole vehicle
+	CMD_RENAME_VEHICLE,               ///< rename a whole vehicle
 	CMD_RENAME_ENGINE,                ///< rename a engine (in the engine list)
 	CMD_CHANGE_COMPANY_NAME,          ///< change the company name
 	CMD_CHANGE_PRESIDENT_NAME,        ///< change the president name
 	CMD_RENAME_COMPANY,               ///< change the company name
 	CMD_RENAME_PRESIDENT,             ///< change the president name
 	CMD_RENAME_STATION,               ///< rename a station
 	CMD_SELL_AIRCRAFT,                ///< sell an aircraft
 	CMD_BUILD_AIRCRAFT,               ///< build an aircraft
 	CMD_SEND_AIRCRAFT_TO_HANGAR,      ///< send an aircraft to a hanger
 	CMD_REFIT_AIRCRAFT,               ///< refit the cargo space of an aircraft

src/misc_cmd.cpp

➞

Show inline comments

@@ @@ -219,13 +219,13 @@ static bool IsUniqueCompanyName(const ch @@
 /** Change the name of the company.
  * @param tile unused
  * @param flags operation to perform
  * @param p1 unused
  * @param p2 unused
  */
-CommandCost CmdChangeCompanyName(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+CommandCost CmdRenameCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
 	bool reset = StrEmpty(_cmd_text);
 	if (!reset) {
 		if (strlen(_cmd_text) >= MAX_LENGTH_COMPANY_NAME_BYTES) return CMD_ERROR;
 		if (!IsUniqueCompanyName(_cmd_text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
@@ @@ -258,13 +258,13 @@ static bool IsUniquePresidentName(const @@
 /** Change the name of the president.
  * @param tile unused
  * @param flags operation to perform
  * @param p1 unused
  * @param p2 unused
  */
-CommandCost CmdChangePresidentName(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+CommandCost CmdRenamePresident(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
 	bool reset = StrEmpty(_cmd_text);
 	if (!reset) {
 		if (strlen(_cmd_text) >= MAX_LENGTH_PRESIDENT_NAME_BYTES) return CMD_ERROR;
 		if (!IsUniquePresidentName(_cmd_text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
@@ @@ -281,13 +281,13 @@ CommandCost CmdChangePresidentName(TileI @@
 			if (p->name_1 == STR_SV_UNNAMED && p->name == NULL) {
 				char buf[80];
 				snprintf(buf, lengthof(buf), "%s Transport", _cmd_text);
 				_cmd_text = buf;
-				DoCommand(0, 0, 0, DC_EXEC, CMD_CHANGE_COMPANY_NAME);
+				DoCommand(0, 0, 0, DC_EXEC, CMD_RENAME_COMPANY);
+			}
+		}
 		MarkWholeScreenDirty();
+	}

src/order_cmd.cpp

➞

Show inline comments

@@ @@ -1256,13 +1256,13 @@ void BackupVehicleOrders(const Vehicle * @@
  */
 void RestoreVehicleOrders(const Vehicle *v, const BackuppedOrders *bak)
+{
 	/* If we have a custom name, process that */
 	if (bak->name != NULL) {
 		_cmd_text = bak->name;
-		DoCommandP(0, v->index, 0, NULL, CMD_NAME_VEHICLE);
+		DoCommandP(0, v->index, 0, NULL, CMD_RENAME_VEHICLE);
+	}
 	/* If we had shared orders, recover that */
 	if (bak->clone != INVALID_VEHICLE) {
 		DoCommandP(0, v->index | (bak->clone << 16), CO_SHARE, NULL, CMD_CLONE_ORDER);
 	} else {

src/player_gui.cpp

➞

Show inline comments

@@ @@ -1332,17 +1332,17 @@ struct PlayerCompanyWindow : Window @@
 		_cmd_text = str;
 		switch (this->query_widget) {
 			default: NOT_REACHED();
 			case PCW_WIDGET_PRESIDENT_NAME:
-				DoCommandP(0, 0, 0, NULL, CMD_CHANGE_PRESIDENT_NAME | CMD_MSG(STR_700D_CAN_T_CHANGE_PRESIDENT));
+				DoCommandP(0, 0, 0, NULL, CMD_RENAME_PRESIDENT | CMD_MSG(STR_700D_CAN_T_CHANGE_PRESIDENT));
 				break;
 			case PCW_WIDGET_COMPANY_NAME:
-				DoCommandP(0, 0, 0, NULL, CMD_CHANGE_COMPANY_NAME | CMD_MSG(STR_700C_CAN_T_CHANGE_COMPANY_NAME));
+				DoCommandP(0, 0, 0, NULL, CMD_RENAME_COMPANY | CMD_MSG(STR_700C_CAN_T_CHANGE_COMPANY_NAME));
 				break;
+		}
+	}
 };
 static const WindowDesc _player_company_desc = {

src/players.cpp

➞

Show inline comments

@@ @@ -877,13 +877,13 @@ CommandCost CmdPlayerCtrl(TileIndex tile @@
 				 * but it works.
 				 * TODO: Perhaps this could be improved by when the client is ready
 				 * with joining to let it send itself the command, and not the server?
 				 * For example in network_client.c:534? */
 				_cmd_text = ci->client_name;
 				_local_player = ci->client_playas;
-				NetworkSend_Command(0, 0, 0, CMD_CHANGE_PRESIDENT_NAME, NULL);
+				NetworkSend_Command(0, 0, 0, CMD_RENAME_PRESIDENT, NULL);
 				_local_player = player_backup;
+			}
+		}
 #endif /* ENABLE_NETWORK */
 	} break;

src/vehicle.cpp

➞

Show inline comments

@@ @@ -1674,13 +1674,13 @@ static bool IsUniqueVehicleName(const ch @@
 /** Give a custom name to your vehicle
  * @param tile unused
  * @param flags type of operation
  * @param p1 vehicle ID to name
  * @param p2 unused
  */
-CommandCost CmdNameVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+CommandCost CmdRenameVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
+{
 	if (!IsValidVehicleID(p1)) return CMD_ERROR;
 	Vehicle *v = GetVehicle(p1);
 	if (!CheckOwnership(v->owner)) return CMD_ERROR;

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -1513,13 +1513,13 @@ struct VehicleDetailsWindow : Window { @@
 			STR_A031_CAN_T_NAME_AIRCRAFT
 		};
 		if (str == NULL) return;
 		_cmd_text = str;
-		DoCommandP(0, this->window_number, 0, NULL, CMD_NAME_VEHICLE | CMD_MSG(_name_vehicle_error[GetVehicle(this->window_number)->type]));
+		DoCommandP(0, this->window_number, 0, NULL, CMD_RENAME_VEHICLE | CMD_MSG(_name_vehicle_error[GetVehicle(this->window_number)->type]));
+	}
 	virtual void OnResize(Point new_size, Point delta)
+	{
 		if (delta.x != 0) ResizeButtons(this, VLD_WIDGET_DETAILS_CARGO_CARRIED, VLD_WIDGET_DETAILS_TOTAL_CARGO);
 		if (delta.y == 0) return;

0 comments (0 inline, 0 general)