summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2008-09-15 22:58:41 +0000
committersmatz <smatz@openttd.org>2008-09-15 22:58:41 +0000
commit5f4ff33ce340fc71e17abbdede06226dd4e56a54 (patch)
tree45c367908e8900a20e722b7841e5eaf20df8cafd /src
parenta20dae0df1614f8701c1ac3a20a64fe6fd4fda5d (diff)
downloadopenttd-5f4ff33ce340fc71e17abbdede06226dd4e56a54.tar.xz
(svn r14337) -Codechange: use CmdRename* and CMD_RENAME_* for vehicle, president and company renaming commands, too
Diffstat (limited to 'src')
-rw-r--r--src/autoreplace_cmd.cpp2
-rw-r--r--src/command.cpp12
-rw-r--r--src/command_type.h6
-rw-r--r--src/misc_cmd.cpp6
-rw-r--r--src/order_cmd.cpp2
-rw-r--r--src/player_gui.cpp4
-rw-r--r--src/players.cpp2
-rw-r--r--src/vehicle.cpp2
-rw-r--r--src/vehicle_gui.cpp2
9 files changed, 19 insertions, 19 deletions
diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp
index a1df6c218..f9293e34b 100644
--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -313,7 +313,7 @@ static CommandCost CopyHeadSpecificThings(Vehicle *old_head, Vehicle *new_head,
/* 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;
}
diff --git a/src/command.cpp b/src/command.cpp
index b94146e2a..034848271 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -113,11 +113,11 @@ 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);
@@ -263,11 +263,11 @@ static const Command _command_proc_table[] = {
{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 */
diff --git a/src/command_type.h b/src/command_type.h
index 0637673cf..0e75187d5 100644
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -209,10 +209,10 @@ enum {
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
diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index 84287bc1a..084949a32 100644
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -222,7 +222,7 @@ static bool IsUniqueCompanyName(const char *name)
* @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);
@@ -261,7 +261,7 @@ static bool IsUniquePresidentName(const char *name)
* @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);
@@ -284,7 +284,7 @@ CommandCost CmdChangePresidentName(TileIndex tile, uint32 flags, uint32 p1, uint
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);
}
}
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index d48d40462..689ca7cd5 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -1259,7 +1259,7 @@ 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 */
diff --git a/src/player_gui.cpp b/src/player_gui.cpp
index 058522f71..77a850ead 100644
--- a/src/player_gui.cpp
+++ b/src/player_gui.cpp
@@ -1335,11 +1335,11 @@ struct PlayerCompanyWindow : Window
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;
}
}
diff --git a/src/players.cpp b/src/players.cpp
index c1875270a..dc3f8ef94 100644
--- a/src/players.cpp
+++ b/src/players.cpp
@@ -880,7 +880,7 @@ CommandCost CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
* 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;
}
}
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index d0de000db..87568e8e8 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -1677,7 +1677,7 @@ static bool IsUniqueVehicleName(const char *name)
* @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;
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index e5a57da66..c4bcc684a 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -1516,7 +1516,7 @@ struct VehicleDetailsWindow : Window {
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)