(svn r12075) -Codechange: Remove explicit numbering on command enum, and remove blanks from command list where old commands have been removed.

2 files changed, 251 insertions, 266 deletions

diff --git a/src/command.cpp b/src/command.cpp
index 0a6393f66..bb7e91456 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -209,160 +209,145 @@ DEF_COMMAND(CmdAutofillTimetable);
  * as the value from the CMD_* enums.
  */
 static const Command _command_proc_table[] = {
-	{CmdBuildRailroadTrack,           CMD_AUTO}, /*   0, CMD_BUILD_RAILROAD_TRACK */
-	{CmdRemoveRailroadTrack,          CMD_AUTO}, /*   1, CMD_REMOVE_RAILROAD_TRACK */
-	{CmdBuildSingleRail,              CMD_AUTO}, /*   2, CMD_BUILD_SINGLE_RAIL */
-	{CmdRemoveSingleRail,             CMD_AUTO}, /*   3, CMD_REMOVE_SINGLE_RAIL */
-	{CmdLandscapeClear,                      0}, /*   4, CMD_LANDSCAPE_CLEAR */
-	{CmdBuildBridge,                  CMD_AUTO}, /*   5, CMD_BUILD_BRIDGE */
-	{CmdBuildRailroadStation,         CMD_AUTO}, /*   6, CMD_BUILD_RAILROAD_STATION */
-	{CmdBuildTrainDepot,              CMD_AUTO}, /*   7, CMD_BUILD_TRAIN_DEPOT */
-	{CmdBuildSingleSignal,            CMD_AUTO}, /*   8, CMD_BUILD_SIGNALS */
-	{CmdRemoveSingleSignal,           CMD_AUTO}, /*   9, CMD_REMOVE_SIGNALS */
-	{CmdTerraformLand,                CMD_AUTO}, /*  10, CMD_TERRAFORM_LAND */
-	{CmdPurchaseLandArea,             CMD_AUTO}, /*  11, CMD_PURCHASE_LAND_AREA */
-	{CmdSellLandArea,                        0}, /*  12, CMD_SELL_LAND_AREA */
-	{CmdBuildTunnel,                  CMD_AUTO}, /*  13, CMD_BUILD_TUNNEL */
-	{CmdRemoveFromRailroadStation,           0}, /*  14, CMD_REMOVE_FROM_RAILROAD_STATION */
-	{CmdConvertRail,                         0}, /*  15, CMD_CONVERT_RAILD */
-	{CmdBuildTrainWaypoint,                  0}, /*  16, CMD_BUILD_TRAIN_WAYPOINT */
-	{CmdRenameWaypoint,                      0}, /*  17, CMD_RENAME_WAYPOINT */
-	{CmdRemoveTrainWaypoint,                 0}, /*  18, CMD_REMOVE_TRAIN_WAYPOINT */
-	{NULL,                                   0}, /*  19, unused */
-	{NULL,                                   0}, /*  20, unused */
-	{CmdBuildRoadStop,                CMD_AUTO}, /*  21, CMD_BUILD_ROAD_STOP */
-	{CmdRemoveRoadStop,                      0}, /*  22, CMD_REMOVE_ROAD_STOP */
-	{CmdBuildLongRoad,                CMD_AUTO}, /*  23, CMD_BUILD_LONG_ROAD */
-	{CmdRemoveLongRoad,               CMD_AUTO}, /*  24, CMD_REMOVE_LONG_ROAD */
-	{CmdBuildRoad,                           0}, /*  25, CMD_BUILD_ROAD */
-	{CmdRemoveRoad,                          0}, /*  26, CMD_REMOVE_ROAD */
-	{CmdBuildRoadDepot,               CMD_AUTO}, /*  27, CMD_BUILD_ROAD_DEPOT */
-	{NULL,                                   0}, /*  28, unused */
-	{CmdBuildAirport,                 CMD_AUTO}, /*  29, CMD_BUILD_AIRPORT */
-	{CmdBuildDock,                    CMD_AUTO}, /*  30, CMD_BUILD_DOCK */
-	{CmdBuildShipDepot,               CMD_AUTO}, /*  31, CMD_BUILD_SHIP_DEPOT */
-	{CmdBuildBuoy,                    CMD_AUTO}, /*  32, CMD_BUILD_BUOY */
-	{CmdPlantTree,                    CMD_AUTO}, /*  33, CMD_PLANT_TREE */
-	{CmdBuildRailVehicle,                    0}, /*  34, CMD_BUILD_RAIL_VEHICLE */
-	{CmdMoveRailVehicle,                     0}, /*  35, CMD_MOVE_RAIL_VEHICLE */
-	{CmdStartStopTrain,                      0}, /*  36, CMD_START_STOP_TRAIN */
-	{NULL,                                   0}, /*  37, unused */
-	{CmdSellRailWagon,                       0}, /*  38, CMD_SELL_RAIL_WAGON */
-	{CmdSendTrainToDepot,                    0}, /*  39, CMD_SEND_TRAIN_TO_DEPOT */
-	{CmdForceTrainProceed,                   0}, /*  40, CMD_FORCE_TRAIN_PROCEED */
-	{CmdReverseTrainDirection,               0}, /*  41, CMD_REVERSE_TRAIN_DIRECTION */
-
-	{CmdModifyOrder,                         0}, /*  42, CMD_MODIFY_ORDER */
-	{CmdSkipToOrder,                         0}, /*  43, CMD_SKIP_TO_ORDER */
-	{CmdDeleteOrder,                         0}, /*  44, CMD_DELETE_ORDER */
-	{CmdInsertOrder,                         0}, /*  45, CMD_INSERT_ORDER */
-
-	{CmdChangeServiceInt,                    0}, /*  46, CMD_CHANGE_SERVICE_INT */
-
-	{CmdBuildIndustry,                       0}, /*  47, CMD_BUILD_INDUSTRY */
-	{CmdBuildCompanyHQ,               CMD_AUTO}, /*  48, CMD_BUILD_COMPANY_HQ */
-	{CmdSetPlayerFace,                       0}, /*  49, CMD_SET_PLAYER_FACE */
-	{CmdSetPlayerColor,                      0}, /*  50, CMD_SET_PLAYER_COLOR */
-
-	{CmdIncreaseLoan,                        0}, /*  51, CMD_INCREASE_LOAN */
-	{CmdDecreaseLoan,                        0}, /*  52, CMD_DECREASE_LOAN */
-
-	{CmdWantEnginePreview,                   0}, /*  53, CMD_WANT_ENGINE_PREVIEW */
-
-	{CmdNameVehicle,                         0}, /*  54, CMD_NAME_VEHICLE */
-	{CmdRenameEngine,                        0}, /*  55, CMD_RENAME_ENGINE */
-
-	{CmdChangeCompanyName,                   0}, /*  56, CMD_CHANGE_COMPANY_NAME */
-	{CmdChangePresidentName,                 0}, /*  57, CMD_CHANGE_PRESIDENT_NAME */
-
-	{CmdRenameStation,                       0}, /*  58, CMD_RENAME_STATION */
-
-	{CmdSellAircraft,                        0}, /*  59, CMD_SELL_AIRCRAFT */
-	{CmdStartStopAircraft,                   0}, /*  60, CMD_START_STOP_AIRCRAFT */
-
-	{CmdBuildAircraft,                       0}, /*  61, CMD_BUILD_AIRCRAFT */
-	{CmdSendAircraftToHangar,                0}, /*  62, CMD_SEND_AIRCRAFT_TO_HANGAR */
-	{NULL,                                   0}, /*  63, unused */
-	{CmdRefitAircraft,                       0}, /*  64, CMD_REFIT_AIRCRAFT */
-
-	{CmdPlaceSign,                           0}, /*  65, CMD_PLACE_SIGN */
-	{CmdRenameSign,                          0}, /*  66, CMD_RENAME_SIGN */
-
-	{CmdBuildRoadVeh,                        0}, /*  67, CMD_BUILD_ROAD_VEH */
-	{CmdStartStopRoadVeh,                    0}, /*  68, CMD_START_STOP_ROADVEH */
-	{CmdSellRoadVeh,                         0}, /*  69, CMD_SELL_ROAD_VEH */
-	{CmdSendRoadVehToDepot,                  0}, /*  70, CMD_SEND_ROADVEH_TO_DEPOT */
-	{CmdTurnRoadVeh,                         0}, /*  71, CMD_TURN_ROADVEH */
-	{CmdRefitRoadVeh,                        0}, /*  72, CMD_REFIT_ROAD_VEH */
-
-	{CmdPause,                      CMD_SERVER}, /*  73, CMD_PAUSE */
-
-	{CmdBuyShareInCompany,                   0}, /*  74, CMD_BUY_SHARE_IN_COMPANY */
-	{CmdSellShareInCompany,                  0}, /*  75, CMD_SELL_SHARE_IN_COMPANY */
-	{CmdBuyCompany,                          0}, /*  76, CMD_BUY_COMANY */
-
-	{CmdBuildTown,                 CMD_OFFLINE}, /*  77, CMD_BUILD_TOWN */
-	{NULL,                                   0}, /*  78, unused */
-	{NULL,                                   0}, /*  79, unused */
-	{CmdRenameTown,                 CMD_SERVER}, /*  80, CMD_RENAME_TOWN */
-	{CmdDoTownAction,                        0}, /*  81, CMD_DO_TOWN_ACTION */
-
-	{CmdSetRoadDriveSide,           CMD_SERVER}, /*  82, CMD_SET_ROAD_DRIVE_SIDE */
-	{NULL,                                   0}, /*  83, unused */
-	{NULL,                                   0}, /*  84, unused */
-	{CmdChangeDifficultyLevel,      CMD_SERVER}, /*  85, CMD_CHANGE_DIFFICULTY_LEVEL */
-
-	{CmdStartStopShip,                       0}, /*  86, CMD_START_STOP_SHIP */
-	{CmdSellShip,                            0}, /*  87, CMD_SELL_SHIP */
-	{CmdBuildShip,                           0}, /*  88, CMD_BUILD_SHIP */
-	{CmdSendShipToDepot,                     0}, /*  89, CMD_SEND_SHIP_TO_DEPOT */
-	{NULL,                                   0}, /*  90, unused */
-	{CmdRefitShip,                           0}, /*  91, CMD_REFIT_SHIP */
-
-	{NULL,                                   0}, /*  92, unused */
-	{NULL,                                   0}, /*  93, unused */
-	{NULL,                                   0}, /*  94, unused */
-	{NULL,                                   0}, /*  95, unused */
-	{NULL,                                   0}, /*  96, unused */
-	{NULL,                                   0}, /*  97, unused */
-
-	{CmdOrderRefit,                          0}, /*  98, CMD_ORDER_REFIT */
-	{CmdCloneOrder,                          0}, /*  99, CMD_CLONE_ORDER */
-
-	{CmdClearArea,                           0}, /* 100, CMD_CLEAR_AREA */
-	{NULL,                                   0}, /* 101, unused */
-
-	{CmdMoneyCheat,                CMD_OFFLINE}, /* 102, CMD_MONEY_CHEAT */
-	{CmdBuildCanal,                   CMD_AUTO}, /* 103, CMD_BUILD_CANAL */
-	{CmdPlayerCtrl,                          0}, /* 104, CMD_PLAYER_CTRL */
-
-	{CmdLevelLand,                    CMD_AUTO}, /* 105, CMD_LEVEL_LAND */
-
-	{CmdRefitRailVehicle,                    0}, /* 106, CMD_REFIT_RAIL_VEHICLE */
-	{CmdRestoreOrderIndex,                   0}, /* 107, CMD_RESTORE_ORDER_INDEX */
-	{CmdBuildLock,                    CMD_AUTO}, /* 108, CMD_BUILD_LOCK */
-	{NULL,                                   0}, /* 109, unused */
-	{CmdBuildSignalTrack,             CMD_AUTO}, /* 110, CMD_BUILD_SIGNAL_TRACK */
-	{CmdRemoveSignalTrack,            CMD_AUTO}, /* 111, CMD_REMOVE_SIGNAL_TRACK */
-	{NULL,                                   0}, /* 112, unused */
-	{CmdGiveMoney,                           0}, /* 113, CMD_GIVE_MONEY */
-	{CmdChangePatchSetting,         CMD_SERVER}, /* 114, CMD_CHANGE_PATCH_SETTING */
-	{CmdSetAutoReplace,                      0}, /* 115, CMD_SET_AUTOREPLACE */
-	{CmdCloneVehicle,                        0}, /* 116, CMD_CLONE_VEHICLE */
-	{CmdMassStartStopVehicle,                0}, /* 117, CMD_MASS_START_STOP */
-	{CmdDepotSellAllVehicles,                0}, /* 118, CMD_DEPOT_SELL_ALL_VEHICLES */
-	{CmdDepotMassAutoReplace,                0}, /* 119, CMD_DEPOT_MASS_AUTOREPLACE */
-	{CmdCreateGroup,                         0}, /* 120, CMD_CREATE_GROUP */
-	{CmdDeleteGroup,                         0}, /* 121, CMD_DELETE_GROUP */
-	{CmdRenameGroup,                         0}, /* 122, CMD_RENAME_GROUP */
-	{CmdAddVehicleGroup,                     0}, /* 123, CMD_ADD_VEHICLE_GROUP */
-	{CmdAddSharedVehicleGroup,               0}, /* 124, CMD_ADD_SHARE_VEHICLE_GROUP */
-	{CmdRemoveAllVehiclesGroup,              0}, /* 125, CMD_REMOVE_ALL_VEHICLES_GROUP */
-	{CmdSetGroupReplaceProtection,           0}, /* 126, CMD_SET_GROUP_REPLACE_PROTECTION */
-	{CmdMoveOrder,                           0}, /* 127, CMD_MOVE_ORDER */
-	{CmdChangeTimetable,                     0}, /* 128, CMD_CHANGE_TIMETABLE */
-	{CmdSetVehicleOnTime,                    0}, /* 129, CMD_SET_VEHICLE_ON_TIME */
-	{CmdAutofillTimetable,                   0}, /* 130, CMD_AUTOFILL_TIMETABLE */
+	{CmdBuildRailroadTrack,           CMD_AUTO}, /* CMD_BUILD_RAILROAD_TRACK */
+	{CmdRemoveRailroadTrack,          CMD_AUTO}, /* CMD_REMOVE_RAILROAD_TRACK */
+	{CmdBuildSingleRail,              CMD_AUTO}, /* CMD_BUILD_SINGLE_RAIL */
+	{CmdRemoveSingleRail,             CMD_AUTO}, /* CMD_REMOVE_SINGLE_RAIL */
+	{CmdLandscapeClear,                      0}, /* CMD_LANDSCAPE_CLEAR */
+	{CmdBuildBridge,                  CMD_AUTO}, /* CMD_BUILD_BRIDGE */
+	{CmdBuildRailroadStation,         CMD_AUTO}, /* CMD_BUILD_RAILROAD_STATION */
+	{CmdBuildTrainDepot,              CMD_AUTO}, /* CMD_BUILD_TRAIN_DEPOT */
+	{CmdBuildSingleSignal,            CMD_AUTO}, /* CMD_BUILD_SIGNALS */
+	{CmdRemoveSingleSignal,           CMD_AUTO}, /* CMD_REMOVE_SIGNALS */
+	{CmdTerraformLand,                CMD_AUTO}, /* CMD_TERRAFORM_LAND */
+	{CmdPurchaseLandArea,             CMD_AUTO}, /* CMD_PURCHASE_LAND_AREA */
+	{CmdSellLandArea,                        0}, /* CMD_SELL_LAND_AREA */
+	{CmdBuildTunnel,                  CMD_AUTO}, /* CMD_BUILD_TUNNEL */
+	{CmdRemoveFromRailroadStation,           0}, /* CMD_REMOVE_FROM_RAILROAD_STATION */
+	{CmdConvertRail,                         0}, /* CMD_CONVERT_RAILD */
+	{CmdBuildTrainWaypoint,                  0}, /* CMD_BUILD_TRAIN_WAYPOINT */
+	{CmdRenameWaypoint,                      0}, /* CMD_RENAME_WAYPOINT */
+	{CmdRemoveTrainWaypoint,                 0}, /* CMD_REMOVE_TRAIN_WAYPOINT */
+
+	{CmdBuildRoadStop,                CMD_AUTO}, /* CMD_BUILD_ROAD_STOP */
+	{CmdRemoveRoadStop,                      0}, /* CMD_REMOVE_ROAD_STOP */
+	{CmdBuildLongRoad,                CMD_AUTO}, /* CMD_BUILD_LONG_ROAD */
+	{CmdRemoveLongRoad,               CMD_AUTO}, /* CMD_REMOVE_LONG_ROAD */
+	{CmdBuildRoad,                           0}, /* CMD_BUILD_ROAD */
+	{CmdRemoveRoad,                          0}, /* CMD_REMOVE_ROAD */
+	{CmdBuildRoadDepot,               CMD_AUTO}, /* CMD_BUILD_ROAD_DEPOT */
+
+	{CmdBuildAirport,                 CMD_AUTO}, /* CMD_BUILD_AIRPORT */
+	{CmdBuildDock,                    CMD_AUTO}, /* CMD_BUILD_DOCK */
+	{CmdBuildShipDepot,               CMD_AUTO}, /* CMD_BUILD_SHIP_DEPOT */
+	{CmdBuildBuoy,                    CMD_AUTO}, /* CMD_BUILD_BUOY */
+	{CmdPlantTree,                    CMD_AUTO}, /* CMD_PLANT_TREE */
+	{CmdBuildRailVehicle,                    0}, /* CMD_BUILD_RAIL_VEHICLE */
+	{CmdMoveRailVehicle,                     0}, /* CMD_MOVE_RAIL_VEHICLE */
+	{CmdStartStopTrain,                      0}, /* CMD_START_STOP_TRAIN */
+
+	{CmdSellRailWagon,                       0}, /* CMD_SELL_RAIL_WAGON */
+	{CmdSendTrainToDepot,                    0}, /* CMD_SEND_TRAIN_TO_DEPOT */
+	{CmdForceTrainProceed,                   0}, /* CMD_FORCE_TRAIN_PROCEED */
+	{CmdReverseTrainDirection,               0}, /* CMD_REVERSE_TRAIN_DIRECTION */
+
+	{CmdModifyOrder,                         0}, /* CMD_MODIFY_ORDER */
+	{CmdSkipToOrder,                         0}, /* CMD_SKIP_TO_ORDER */
+	{CmdDeleteOrder,                         0}, /* CMD_DELETE_ORDER */
+	{CmdInsertOrder,                         0}, /* CMD_INSERT_ORDER */
+
+	{CmdChangeServiceInt,                    0}, /* CMD_CHANGE_SERVICE_INT */
+
+	{CmdBuildIndustry,                       0}, /* CMD_BUILD_INDUSTRY */
+	{CmdBuildCompanyHQ,               CMD_AUTO}, /* CMD_BUILD_COMPANY_HQ */
+	{CmdSetPlayerFace,                       0}, /* CMD_SET_PLAYER_FACE */
+	{CmdSetPlayerColor,                      0}, /* CMD_SET_PLAYER_COLOR */
+
+	{CmdIncreaseLoan,                        0}, /* CMD_INCREASE_LOAN */
+	{CmdDecreaseLoan,                        0}, /* CMD_DECREASE_LOAN */
+
+	{CmdWantEnginePreview,                   0}, /* CMD_WANT_ENGINE_PREVIEW */
+
+	{CmdNameVehicle,                         0}, /* CMD_NAME_VEHICLE */
+	{CmdRenameEngine,                        0}, /* CMD_RENAME_ENGINE */
+
+	{CmdChangeCompanyName,                   0}, /* CMD_CHANGE_COMPANY_NAME */
+	{CmdChangePresidentName,                 0}, /* CMD_CHANGE_PRESIDENT_NAME */
+
+	{CmdRenameStation,                       0}, /* CMD_RENAME_STATION */
+
+	{CmdSellAircraft,                        0}, /* CMD_SELL_AIRCRAFT */
+	{CmdStartStopAircraft,                   0}, /* CMD_START_STOP_AIRCRAFT */
+
+	{CmdBuildAircraft,                       0}, /* CMD_BUILD_AIRCRAFT */
+	{CmdSendAircraftToHangar,                0}, /* CMD_SEND_AIRCRAFT_TO_HANGAR */
+	{CmdRefitAircraft,                       0}, /* CMD_REFIT_AIRCRAFT */
+
+	{CmdPlaceSign,                           0}, /* CMD_PLACE_SIGN */
+	{CmdRenameSign,                          0}, /* CMD_RENAME_SIGN */
+
+	{CmdBuildRoadVeh,                        0}, /* CMD_BUILD_ROAD_VEH */
+	{CmdStartStopRoadVeh,                    0}, /* CMD_START_STOP_ROADVEH */
+	{CmdSellRoadVeh,                         0}, /* CMD_SELL_ROAD_VEH */
+	{CmdSendRoadVehToDepot,                  0}, /* CMD_SEND_ROADVEH_TO_DEPOT */
+	{CmdTurnRoadVeh,                         0}, /* CMD_TURN_ROADVEH */
+	{CmdRefitRoadVeh,                        0}, /* CMD_REFIT_ROAD_VEH */
+
+	{CmdPause,                      CMD_SERVER}, /* CMD_PAUSE */
+
+	{CmdBuyShareInCompany,                   0}, /* CMD_BUY_SHARE_IN_COMPANY */
+	{CmdSellShareInCompany,                  0}, /* CMD_SELL_SHARE_IN_COMPANY */
+	{CmdBuyCompany,                          0}, /* CMD_BUY_COMANY */
+
+	{CmdBuildTown,                 CMD_OFFLINE}, /* CMD_BUILD_TOWN */
+	{CmdRenameTown,                 CMD_SERVER}, /* CMD_RENAME_TOWN */
+	{CmdDoTownAction,                        0}, /* CMD_DO_TOWN_ACTION */
+
+	{CmdSetRoadDriveSide,           CMD_SERVER}, /* CMD_SET_ROAD_DRIVE_SIDE */
+	{CmdChangeDifficultyLevel,      CMD_SERVER}, /* CMD_CHANGE_DIFFICULTY_LEVEL */
+
+	{CmdStartStopShip,                       0}, /* CMD_START_STOP_SHIP */
+	{CmdSellShip,                            0}, /* CMD_SELL_SHIP */
+	{CmdBuildShip,                           0}, /* CMD_BUILD_SHIP */
+	{CmdSendShipToDepot,                     0}, /* CMD_SEND_SHIP_TO_DEPOT */
+	{CmdRefitShip,                           0}, /* CMD_REFIT_SHIP */
+
+	{CmdOrderRefit,                          0}, /* CMD_ORDER_REFIT */
+	{CmdCloneOrder,                          0}, /* CMD_CLONE_ORDER */
+
+	{CmdClearArea,                           0}, /* CMD_CLEAR_AREA */
+
+	{CmdMoneyCheat,                CMD_OFFLINE}, /* CMD_MONEY_CHEAT */
+	{CmdBuildCanal,                   CMD_AUTO}, /* CMD_BUILD_CANAL */
+	{CmdPlayerCtrl,                          0}, /* CMD_PLAYER_CTRL */
+
+	{CmdLevelLand,                    CMD_AUTO}, /* CMD_LEVEL_LAND */
+
+	{CmdRefitRailVehicle,                    0}, /* CMD_REFIT_RAIL_VEHICLE */
+	{CmdRestoreOrderIndex,                   0}, /* CMD_RESTORE_ORDER_INDEX */
+	{CmdBuildLock,                    CMD_AUTO}, /* CMD_BUILD_LOCK */
+
+	{CmdBuildSignalTrack,             CMD_AUTO}, /* CMD_BUILD_SIGNAL_TRACK */
+	{CmdRemoveSignalTrack,            CMD_AUTO}, /* CMD_REMOVE_SIGNAL_TRACK */
+
+	{CmdGiveMoney,                           0}, /* CMD_GIVE_MONEY */
+	{CmdChangePatchSetting,         CMD_SERVER}, /* CMD_CHANGE_PATCH_SETTING */
+	{CmdSetAutoReplace,                      0}, /* CMD_SET_AUTOREPLACE */
+	{CmdCloneVehicle,                        0}, /* CMD_CLONE_VEHICLE */
+	{CmdMassStartStopVehicle,                0}, /* CMD_MASS_START_STOP */
+	{CmdDepotSellAllVehicles,                0}, /* CMD_DEPOT_SELL_ALL_VEHICLES */
+	{CmdDepotMassAutoReplace,                0}, /* CMD_DEPOT_MASS_AUTOREPLACE */
+	{CmdCreateGroup,                         0}, /* CMD_CREATE_GROUP */
+	{CmdDeleteGroup,                         0}, /* CMD_DELETE_GROUP */
+	{CmdRenameGroup,                         0}, /* CMD_RENAME_GROUP */
+	{CmdAddVehicleGroup,                     0}, /* CMD_ADD_VEHICLE_GROUP */
+	{CmdAddSharedVehicleGroup,               0}, /* CMD_ADD_SHARE_VEHICLE_GROUP */
+	{CmdRemoveAllVehiclesGroup,              0}, /* CMD_REMOVE_ALL_VEHICLES_GROUP */
+	{CmdSetGroupReplaceProtection,           0}, /* CMD_SET_GROUP_REPLACE_PROTECTION */
+	{CmdMoveOrder,                           0}, /* CMD_MOVE_ORDER */
+	{CmdChangeTimetable,                     0}, /* CMD_CHANGE_TIMETABLE */
+	{CmdSetVehicleOnTime,                    0}, /* CMD_SET_VEHICLE_ON_TIME */
+	{CmdAutofillTimetable,                   0}, /* CMD_AUTOFILL_TIMETABLE */
 };
 
 /*!
diff --git a/src/command_type.h b/src/command_type.h
index 9a2649cbc..4fc0f87ef 100644
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -106,156 +106,156 @@ public:
  * @see _command_proc_table
  */
 enum {
-	CMD_BUILD_RAILROAD_TRACK         =   0, ///< build a rail track
-	CMD_REMOVE_RAILROAD_TRACK        =   1, ///< remove a rail track
-	CMD_BUILD_SINGLE_RAIL            =   2, ///< build a single rail track
-	CMD_REMOVE_SINGLE_RAIL           =   3, ///< remove a single rail track
-	CMD_LANDSCAPE_CLEAR              =   4, ///< demolish a tile
-	CMD_BUILD_BRIDGE                 =   5, ///< build a bridge
-	CMD_BUILD_RAILROAD_STATION       =   6, ///< build a railroad station
-	CMD_BUILD_TRAIN_DEPOT            =   7, ///< build a train depot
-	CMD_BUILD_SIGNALS                =   8, ///< build a signal
-	CMD_REMOVE_SIGNALS               =   9, ///< remove a signal
-	CMD_TERRAFORM_LAND               =  10, ///< terraform a tile
-	CMD_PURCHASE_LAND_AREA           =  11, ///< purchase a tile
-	CMD_SELL_LAND_AREA               =  12, ///< sell a bought tile before
-	CMD_BUILD_TUNNEL                 =  13, ///< build a tunnel
+	CMD_BUILD_RAILROAD_TRACK,         ///< build a rail track
+	CMD_REMOVE_RAILROAD_TRACK,        ///< remove a rail track
+	CMD_BUILD_SINGLE_RAIL,            ///< build a single rail track
+	CMD_REMOVE_SINGLE_RAIL,           ///< remove a single rail track
+	CMD_LANDSCAPE_CLEAR,              ///< demolish a tile
+	CMD_BUILD_BRIDGE,                 ///< build a bridge
+	CMD_BUILD_RAILROAD_STATION,       ///< build a railroad station
+	CMD_BUILD_TRAIN_DEPOT,            ///< build a train depot
+	CMD_BUILD_SIGNALS,                ///< build a signal
+	CMD_REMOVE_SIGNALS,               ///< remove a signal
+	CMD_TERRAFORM_LAND,               ///< terraform a tile
+	CMD_PURCHASE_LAND_AREA,           ///< purchase a tile
+	CMD_SELL_LAND_AREA,               ///< sell a bought tile before
+	CMD_BUILD_TUNNEL,                 ///< build a tunnel
 
-	CMD_REMOVE_FROM_RAILROAD_STATION =  14, ///< remove a tile station
-	CMD_CONVERT_RAIL                 =  15, ///< convert a rail type
+	CMD_REMOVE_FROM_RAILROAD_STATION, ///< remove a tile station
+	CMD_CONVERT_RAIL,                 ///< convert a rail type
 
-	CMD_BUILD_TRAIN_WAYPOINT         =  16, ///< build a waypoint
-	CMD_RENAME_WAYPOINT              =  17, ///< rename a waypoint
-	CMD_REMOVE_TRAIN_WAYPOINT        =  18, ///< remove a waypoint
+	CMD_BUILD_TRAIN_WAYPOINT,         ///< build a waypoint
+	CMD_RENAME_WAYPOINT,              ///< rename a waypoint
+	CMD_REMOVE_TRAIN_WAYPOINT,        ///< remove a waypoint
 
-	CMD_BUILD_ROAD_STOP              =  21, ///< build a road stop
-	CMD_REMOVE_ROAD_STOP             =  22, ///< remove a road stop
-	CMD_BUILD_LONG_ROAD              =  23, ///< build a complete road (not a "half" one)
-	CMD_REMOVE_LONG_ROAD             =  24, ///< remove a complete road (not a "half" one)
-	CMD_BUILD_ROAD                   =  25, ///< build a "half" road
-	CMD_REMOVE_ROAD                  =  26, ///< remove a "half" road
-	CMD_BUILD_ROAD_DEPOT             =  27, ///< build a road depot
+	CMD_BUILD_ROAD_STOP,              ///< build a road stop
+	CMD_REMOVE_ROAD_STOP,             ///< remove a road stop
+	CMD_BUILD_LONG_ROAD,              ///< build a complete road (not a "half" one)
+	CMD_REMOVE_LONG_ROAD,             ///< remove a complete road (not a "half" one)
+	CMD_BUILD_ROAD,                   ///< build a "half" road
+	CMD_REMOVE_ROAD,                  ///< remove a "half" road
+	CMD_BUILD_ROAD_DEPOT,             ///< build a road depot
 
-	CMD_BUILD_AIRPORT                =  29, ///< build an airport
+	CMD_BUILD_AIRPORT,                ///< build an airport
 
-	CMD_BUILD_DOCK                   =  30, ///< build a dock
+	CMD_BUILD_DOCK,                   ///< build a dock
 
-	CMD_BUILD_SHIP_DEPOT             =  31, ///< build a ship depot
-	CMD_BUILD_BUOY                   =  32, ///< build a buoy
+	CMD_BUILD_SHIP_DEPOT,             ///< build a ship depot
+	CMD_BUILD_BUOY,                   ///< build a buoy
 
-	CMD_PLANT_TREE                   =  33, ///< plant a tree
+	CMD_PLANT_TREE,                   ///< plant a tree
 
-	CMD_BUILD_RAIL_VEHICLE           =  34, ///< build a rail vehicle
-	CMD_MOVE_RAIL_VEHICLE            =  35, ///< move a rail vehicle (in the depot)
+	CMD_BUILD_RAIL_VEHICLE,           ///< build a rail vehicle
+	CMD_MOVE_RAIL_VEHICLE,            ///< move a rail vehicle (in the depot)
 
-	CMD_START_STOP_TRAIN             =  36, ///< start or stop a train
+	CMD_START_STOP_TRAIN,             ///< start or stop a train
 
-	CMD_SELL_RAIL_WAGON              =  38, ///< sell a rail wagon
+	CMD_SELL_RAIL_WAGON,              ///< sell a rail wagon
 
-	CMD_SEND_TRAIN_TO_DEPOT          =  39, ///< send a train to a depot
-	CMD_FORCE_TRAIN_PROCEED          =  40, ///< proceed a train to pass a red signal
-	CMD_REVERSE_TRAIN_DIRECTION      =  41, ///< turn a train around
+	CMD_SEND_TRAIN_TO_DEPOT,          ///< send a train to a depot
+	CMD_FORCE_TRAIN_PROCEED,          ///< proceed a train to pass a red signal
+	CMD_REVERSE_TRAIN_DIRECTION,      ///< turn a train around
 
-	CMD_MODIFY_ORDER                 =  42, ///< modify an order (like set full-load)
-	CMD_SKIP_TO_ORDER                =  43, ///< skip an order to the next of specific one
-	CMD_DELETE_ORDER                 =  44, ///< delete an order
-	CMD_INSERT_ORDER                 =  45, ///< insert a new order
+	CMD_MODIFY_ORDER,                 ///< modify an order (like set full-load)
+	CMD_SKIP_TO_ORDER,                ///< skip an order to the next of specific one
+	CMD_DELETE_ORDER,                 ///< delete an order
+	CMD_INSERT_ORDER,                 ///< insert a new order
 
-	CMD_CHANGE_SERVICE_INT           =  46, ///< change the server interval of a vehicle
+	CMD_CHANGE_SERVICE_INT,           ///< change the server interval of a vehicle
 
-	CMD_BUILD_INDUSTRY               =  47, ///< build a new industry
+	CMD_BUILD_INDUSTRY,               ///< build a new industry
 
-	CMD_BUILD_COMPANY_HQ             =  48, ///< build the company headquarter
-	CMD_SET_PLAYER_FACE              =  49, ///< set the face of the player/company
-	CMD_SET_PLAYER_COLOR             =  50, ///< set the color of the player/company
+	CMD_BUILD_COMPANY_HQ,             ///< build the company headquarter
+	CMD_SET_PLAYER_FACE,              ///< set the face of the player/company
+	CMD_SET_PLAYER_COLOR,             ///< set the color of the player/company
 
-	CMD_INCREASE_LOAN                =  51, ///< increase the loan from the bank
-	CMD_DECREASE_LOAN                =  52, ///< decrease the loan from the bank
+	CMD_INCREASE_LOAN,                ///< increase the loan from the bank
+	CMD_DECREASE_LOAN,                ///< decrease the loan from the bank
 
-	CMD_WANT_ENGINE_PREVIEW          =  53, ///< confirm the preview of an engine
+	CMD_WANT_ENGINE_PREVIEW,          ///< confirm the preview of an engine
 
-	CMD_NAME_VEHICLE                 =  54, ///< rename a whole vehicle
-	CMD_RENAME_ENGINE                =  55, ///< rename a engine (in the engine list)
-	CMD_CHANGE_COMPANY_NAME          =  56, ///< change the company name
-	CMD_CHANGE_PRESIDENT_NAME        =  57, ///< change the president name
-	CMD_RENAME_STATION               =  58, ///< rename a station
+	CMD_NAME_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_STATION,               ///< rename a station
 
-	CMD_SELL_AIRCRAFT                =  59, ///< sell an aircraft
-	CMD_START_STOP_AIRCRAFT          =  60, ///< start/stop an aircraft
-	CMD_BUILD_AIRCRAFT               =  61, ///< build an aircraft
-	CMD_SEND_AIRCRAFT_TO_HANGAR      =  62, ///< send an aircraft to a hanger
-	CMD_REFIT_AIRCRAFT               =  64, ///< refit the cargo space of an aircraft
+	CMD_SELL_AIRCRAFT,                ///< sell an aircraft
+	CMD_START_STOP_AIRCRAFT,          ///< start/stop 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
 
-	CMD_PLACE_SIGN                   =  65, ///< place a sign
-	CMD_RENAME_SIGN                  =  66, ///< rename a sign
+	CMD_PLACE_SIGN,                   ///< place a sign
+	CMD_RENAME_SIGN,                  ///< rename a sign
 
-	CMD_BUILD_ROAD_VEH               =  67, ///< build a road vehicle
-	CMD_START_STOP_ROADVEH           =  68, ///< start/stop a road vehicle
-	CMD_SELL_ROAD_VEH                =  69, ///< sell a road vehicle
-	CMD_SEND_ROADVEH_TO_DEPOT        =  70, ///< send a road vehicle to the depot
-	CMD_TURN_ROADVEH                 =  71, ///< turn a road vehicle around
-	CMD_REFIT_ROAD_VEH               =  72, ///< refit the cargo space of a road vehicle
+	CMD_BUILD_ROAD_VEH,               ///< build a road vehicle
+	CMD_START_STOP_ROADVEH,           ///< start/stop a road vehicle
+	CMD_SELL_ROAD_VEH,                ///< sell a road vehicle
+	CMD_SEND_ROADVEH_TO_DEPOT,        ///< send a road vehicle to the depot
+	CMD_TURN_ROADVEH,                 ///< turn a road vehicle around
+	CMD_REFIT_ROAD_VEH,               ///< refit the cargo space of a road vehicle
 
-	CMD_PAUSE                        =  73, ///< pause the game
+	CMD_PAUSE,                        ///< pause the game
 
-	CMD_BUY_SHARE_IN_COMPANY         =  74, ///< buy a share from a company
-	CMD_SELL_SHARE_IN_COMPANY        =  75, ///< sell a share from a company
-	CMD_BUY_COMPANY                  =  76, ///< buy a company which is bankrupt
+	CMD_BUY_SHARE_IN_COMPANY,         ///< buy a share from a company
+	CMD_SELL_SHARE_IN_COMPANY,        ///< sell a share from a company
+	CMD_BUY_COMPANY,                  ///< buy a company which is bankrupt
 
-	CMD_BUILD_TOWN                   =  77, ///< build a town
+	CMD_BUILD_TOWN,                   ///< build a town
 
-	CMD_RENAME_TOWN                  =  80, ///< rename a town
-	CMD_DO_TOWN_ACTION               =  81, ///< do a action from the town detail window (like advertises or bribe)
+	CMD_RENAME_TOWN,                  ///< rename a town
+	CMD_DO_TOWN_ACTION,               ///< do a action from the town detail window (like advertises or bribe)
 
-	CMD_SET_ROAD_DRIVE_SIDE          =  82, ///< set the side where the road vehicles drive
+	CMD_SET_ROAD_DRIVE_SIDE,          ///< set the side where the road vehicles drive
 
-	CMD_CHANGE_DIFFICULTY_LEVEL      =  85, ///< change the difficult of a game (each setting for it own)
+	CMD_CHANGE_DIFFICULTY_LEVEL,      ///< change the difficult of a game (each setting for it own)
 
-	CMD_START_STOP_SHIP              =  86, ///< start/stop a ship
-	CMD_SELL_SHIP                    =  87, ///< sell a ship
-	CMD_BUILD_SHIP                   =  88, ///< build a new ship
-	CMD_SEND_SHIP_TO_DEPOT           =  89, ///< send a ship to a depot
-	CMD_REFIT_SHIP                   =  91, ///< refit the cargo space of a ship
+	CMD_START_STOP_SHIP,              ///< start/stop a ship
+	CMD_SELL_SHIP,                    ///< sell a ship
+	CMD_BUILD_SHIP,                   ///< build a new ship
+	CMD_SEND_SHIP_TO_DEPOT,           ///< send a ship to a depot
+	CMD_REFIT_SHIP,                   ///< refit the cargo space of a ship
 
-	CMD_ORDER_REFIT                  =  98, ///< change the refit informaction of an order (for "goto depot" )
-	CMD_CLONE_ORDER                  =  99, ///< clone (and share) an order
-	CMD_CLEAR_AREA                   = 100, ///< clear an area
+	CMD_ORDER_REFIT,                  ///< change the refit informaction of an order (for "goto depot" )
+	CMD_CLONE_ORDER,                  ///< clone (and share) an order
+	CMD_CLEAR_AREA,                   ///< clear an area
 
-	CMD_MONEY_CHEAT                  = 102, ///< do the money cheat
-	CMD_BUILD_CANAL                  = 103, ///< build a canal
+	CMD_MONEY_CHEAT,                  ///< do the money cheat
+	CMD_BUILD_CANAL,                  ///< build a canal
 
-	CMD_PLAYER_CTRL                  = 104, ///< used in multiplayer to create a new player etc.
-	CMD_LEVEL_LAND                   = 105, ///< level land
+	CMD_PLAYER_CTRL,                  ///< used in multiplayer to create a new player etc.
+	CMD_LEVEL_LAND,                   ///< level land
 
-	CMD_REFIT_RAIL_VEHICLE           = 106, ///< refit the cargo space of a train
-	CMD_RESTORE_ORDER_INDEX          = 107, ///< restore vehicle order-index and service interval
-	CMD_BUILD_LOCK                   = 108, ///< build a lock
+	CMD_REFIT_RAIL_VEHICLE,           ///< refit the cargo space of a train
+	CMD_RESTORE_ORDER_INDEX,          ///< restore vehicle order-index and service interval
+	CMD_BUILD_LOCK,                   ///< build a lock
 
-	CMD_BUILD_SIGNAL_TRACK           = 110, ///< add signals along a track (by dragging)
-	CMD_REMOVE_SIGNAL_TRACK          = 111, ///< remove signals along a track (by dragging)
+	CMD_BUILD_SIGNAL_TRACK,           ///< add signals along a track (by dragging)
+	CMD_REMOVE_SIGNAL_TRACK,          ///< remove signals along a track (by dragging)
 
-	CMD_GIVE_MONEY                   = 113, ///< give money to an other player
-	CMD_CHANGE_PATCH_SETTING         = 114, ///< change a patch setting
+	CMD_GIVE_MONEY,                   ///< give money to an other player
+	CMD_CHANGE_PATCH_SETTING,         ///< change a patch setting
 
-	CMD_SET_AUTOREPLACE              = 115, ///< set an autoreplace entry
+	CMD_SET_AUTOREPLACE,              ///< set an autoreplace entry
 
-	CMD_CLONE_VEHICLE                = 116, ///< clone a vehicle
-	CMD_MASS_START_STOP              = 117, ///< start/stop all vehicles (in a depot)
-	CMD_DEPOT_SELL_ALL_VEHICLES      = 118, ///< sell all vehicles which are in a given depot
-	CMD_DEPOT_MASS_AUTOREPLACE       = 119, ///< force the autoreplace to take action in a given depot
+	CMD_CLONE_VEHICLE,                ///< clone a vehicle
+	CMD_MASS_START_STOP,              ///< start/stop all vehicles (in a depot)
+	CMD_DEPOT_SELL_ALL_VEHICLES,      ///< sell all vehicles which are in a given depot
+	CMD_DEPOT_MASS_AUTOREPLACE,       ///< force the autoreplace to take action in a given depot
 
-	CMD_CREATE_GROUP                 = 120, ///< create a new group
-	CMD_DELETE_GROUP                 = 121, ///< delete a group
-	CMD_RENAME_GROUP                 = 122, ///< rename a group
-	CMD_ADD_VEHICLE_GROUP            = 123, ///< add a vehicle to a group
-	CMD_ADD_SHARED_VEHICLE_GROUP     = 124, ///< add all other shared vehicles to a group which are missing
-	CMD_REMOVE_ALL_VEHICLES_GROUP    = 125, ///< remove all vehicles from a group
-	CMD_SET_GROUP_REPLACE_PROTECTION = 126, ///< set the autoreplace-protection for a group
+	CMD_CREATE_GROUP,                 ///< create a new group
+	CMD_DELETE_GROUP,                 ///< delete a group
+	CMD_RENAME_GROUP,                 ///< rename a group
+	CMD_ADD_VEHICLE_GROUP,            ///< add a vehicle to a group
+	CMD_ADD_SHARED_VEHICLE_GROUP,     ///< add all other shared vehicles to a group which are missing
+	CMD_REMOVE_ALL_VEHICLES_GROUP,    ///< remove all vehicles from a group
+	CMD_SET_GROUP_REPLACE_PROTECTION, ///< set the autoreplace-protection for a group
 
-	CMD_MOVE_ORDER                   = 127, ///< move an order
-	CMD_CHANGE_TIMETABLE             = 128, ///< change the timetable for a vehicle
-	CMD_SET_VEHICLE_ON_TIME          = 129, ///< set the vehicle on time feature (timetable)
-	CMD_AUTOFILL_TIMETABLE           = 130, ///< autofill the timetable
+	CMD_MOVE_ORDER,                   ///< move an order
+	CMD_CHANGE_TIMETABLE,             ///< change the timetable for a vehicle
+	CMD_SET_VEHICLE_ON_TIME,          ///< set the vehicle on time feature (timetable)
+	CMD_AUTOFILL_TIMETABLE,           ///< autofill the timetable
 };
 
 /**