(svn r18788) -Codechange: replace macro as without macro it's shorter than with the macro.

This commit is contained in:
rubidium 2010-01-11 22:46:00 +00:00
parent a535acb549
commit 351eb4665c
1 changed files with 110 additions and 122 deletions

View File

@ -31,175 +31,163 @@
StringID _error_message; StringID _error_message;
/** CommandProc CmdBuildRailroadTrack;
* Helper macro to define the header of all command handler macros. CommandProc CmdRemoveRailroadTrack;
* CommandProc CmdBuildSingleRail;
* This macro create the function header for a given command handler function, as CommandProc CmdRemoveSingleRail;
* all command handler functions got the parameters from the #CommandProc callback
* type.
*
* @param yyyy The desired function name of the new command handler function.
*/
#define DEF_COMMAND(yyyy) CommandCost yyyy(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
DEF_COMMAND(CmdBuildRailroadTrack); CommandProc CmdLandscapeClear;
DEF_COMMAND(CmdRemoveRailroadTrack);
DEF_COMMAND(CmdBuildSingleRail);
DEF_COMMAND(CmdRemoveSingleRail);
DEF_COMMAND(CmdLandscapeClear); CommandProc CmdBuildBridge;
DEF_COMMAND(CmdBuildBridge); CommandProc CmdBuildRailStation;
CommandProc CmdRemoveFromRailStation;
CommandProc CmdConvertRail;
DEF_COMMAND(CmdBuildRailStation); CommandProc CmdBuildSingleSignal;
DEF_COMMAND(CmdRemoveFromRailStation); CommandProc CmdRemoveSingleSignal;
DEF_COMMAND(CmdConvertRail);
DEF_COMMAND(CmdBuildSingleSignal); CommandProc CmdTerraformLand;
DEF_COMMAND(CmdRemoveSingleSignal);
DEF_COMMAND(CmdTerraformLand); CommandProc CmdPurchaseLandArea;
CommandProc CmdSellLandArea;
DEF_COMMAND(CmdPurchaseLandArea); CommandProc CmdBuildTunnel;
DEF_COMMAND(CmdSellLandArea);
DEF_COMMAND(CmdBuildTunnel); CommandProc CmdBuildTrainDepot;
CommandProc CmdBuildRailWaypoint;
CommandProc CmdRenameWaypoint;
CommandProc CmdRemoveFromRailWaypoint;
DEF_COMMAND(CmdBuildTrainDepot); CommandProc CmdBuildRoadStop;
DEF_COMMAND(CmdBuildRailWaypoint); CommandProc CmdRemoveRoadStop;
DEF_COMMAND(CmdRenameWaypoint);
DEF_COMMAND(CmdRemoveFromRailWaypoint);
DEF_COMMAND(CmdBuildRoadStop); CommandProc CmdBuildLongRoad;
DEF_COMMAND(CmdRemoveRoadStop); CommandProc CmdRemoveLongRoad;
CommandProc CmdBuildRoad;
CommandProc CmdRemoveRoad;
DEF_COMMAND(CmdBuildLongRoad); CommandProc CmdBuildRoadDepot;
DEF_COMMAND(CmdRemoveLongRoad);
DEF_COMMAND(CmdBuildRoad);
DEF_COMMAND(CmdRemoveRoad);
DEF_COMMAND(CmdBuildRoadDepot); CommandProc CmdBuildAirport;
DEF_COMMAND(CmdBuildAirport); CommandProc CmdBuildDock;
DEF_COMMAND(CmdBuildDock); CommandProc CmdBuildShipDepot;
DEF_COMMAND(CmdBuildShipDepot); CommandProc CmdBuildBuoy;
DEF_COMMAND(CmdBuildBuoy); CommandProc CmdPlantTree;
DEF_COMMAND(CmdPlantTree); CommandProc CmdBuildRailVehicle;
CommandProc CmdMoveRailVehicle;
DEF_COMMAND(CmdBuildRailVehicle); CommandProc CmdSellRailWagon;
DEF_COMMAND(CmdMoveRailVehicle);
DEF_COMMAND(CmdSellRailWagon); CommandProc CmdSendTrainToDepot;
CommandProc CmdForceTrainProceed;
CommandProc CmdReverseTrainDirection;
DEF_COMMAND(CmdSendTrainToDepot); CommandProc CmdModifyOrder;
DEF_COMMAND(CmdForceTrainProceed); CommandProc CmdSkipToOrder;
DEF_COMMAND(CmdReverseTrainDirection); CommandProc CmdDeleteOrder;
CommandProc CmdInsertOrder;
CommandProc CmdChangeServiceInt;
CommandProc CmdRestoreOrderIndex;
DEF_COMMAND(CmdModifyOrder); CommandProc CmdBuildIndustry;
DEF_COMMAND(CmdSkipToOrder);
DEF_COMMAND(CmdDeleteOrder);
DEF_COMMAND(CmdInsertOrder);
DEF_COMMAND(CmdChangeServiceInt);
DEF_COMMAND(CmdRestoreOrderIndex);
DEF_COMMAND(CmdBuildIndustry); CommandProc CmdBuildCompanyHQ;
CommandProc CmdSetCompanyManagerFace;
CommandProc CmdSetCompanyColour;
DEF_COMMAND(CmdBuildCompanyHQ); CommandProc CmdIncreaseLoan;
DEF_COMMAND(CmdSetCompanyManagerFace); CommandProc CmdDecreaseLoan;
DEF_COMMAND(CmdSetCompanyColour);
DEF_COMMAND(CmdIncreaseLoan); CommandProc CmdWantEnginePreview;
DEF_COMMAND(CmdDecreaseLoan);
DEF_COMMAND(CmdWantEnginePreview); CommandProc CmdRenameVehicle;
CommandProc CmdRenameEngine;
DEF_COMMAND(CmdRenameVehicle); CommandProc CmdRenameCompany;
DEF_COMMAND(CmdRenameEngine); CommandProc CmdRenamePresident;
DEF_COMMAND(CmdRenameCompany); CommandProc CmdRenameStation;
DEF_COMMAND(CmdRenamePresident);
DEF_COMMAND(CmdRenameStation); CommandProc CmdSellAircraft;
CommandProc CmdBuildAircraft;
CommandProc CmdSendAircraftToHangar;
CommandProc CmdRefitAircraft;
DEF_COMMAND(CmdSellAircraft); CommandProc CmdPlaceSign;
DEF_COMMAND(CmdBuildAircraft); CommandProc CmdRenameSign;
DEF_COMMAND(CmdSendAircraftToHangar);
DEF_COMMAND(CmdRefitAircraft);
DEF_COMMAND(CmdPlaceSign); CommandProc CmdBuildRoadVeh;
DEF_COMMAND(CmdRenameSign); CommandProc CmdSellRoadVeh;
CommandProc CmdSendRoadVehToDepot;
CommandProc CmdTurnRoadVeh;
CommandProc CmdRefitRoadVeh;
DEF_COMMAND(CmdBuildRoadVeh); CommandProc CmdPause;
DEF_COMMAND(CmdSellRoadVeh);
DEF_COMMAND(CmdSendRoadVehToDepot);
DEF_COMMAND(CmdTurnRoadVeh);
DEF_COMMAND(CmdRefitRoadVeh);
DEF_COMMAND(CmdPause); CommandProc CmdBuyShareInCompany;
CommandProc CmdSellShareInCompany;
CommandProc CmdBuyCompany;
DEF_COMMAND(CmdBuyShareInCompany); CommandProc CmdFoundTown;
DEF_COMMAND(CmdSellShareInCompany);
DEF_COMMAND(CmdBuyCompany);
DEF_COMMAND(CmdFoundTown); CommandProc CmdRenameTown;
CommandProc CmdDoTownAction;
DEF_COMMAND(CmdRenameTown); CommandProc CmdChangeSetting;
DEF_COMMAND(CmdDoTownAction); CommandProc CmdChangeCompanySetting;
DEF_COMMAND(CmdChangeSetting); CommandProc CmdSellShip;
DEF_COMMAND(CmdChangeCompanySetting); CommandProc CmdBuildShip;
CommandProc CmdSendShipToDepot;
CommandProc CmdRefitShip;
DEF_COMMAND(CmdSellShip); CommandProc CmdOrderRefit;
DEF_COMMAND(CmdBuildShip); CommandProc CmdCloneOrder;
DEF_COMMAND(CmdSendShipToDepot);
DEF_COMMAND(CmdRefitShip);
DEF_COMMAND(CmdOrderRefit); CommandProc CmdClearArea;
DEF_COMMAND(CmdCloneOrder);
DEF_COMMAND(CmdClearArea); CommandProc CmdGiveMoney;
CommandProc CmdMoneyCheat;
CommandProc CmdBuildCanal;
CommandProc CmdBuildLock;
DEF_COMMAND(CmdGiveMoney); CommandProc CmdCompanyCtrl;
DEF_COMMAND(CmdMoneyCheat);
DEF_COMMAND(CmdBuildCanal);
DEF_COMMAND(CmdBuildLock);
DEF_COMMAND(CmdCompanyCtrl); CommandProc CmdLevelLand;
DEF_COMMAND(CmdLevelLand); CommandProc CmdRefitRailVehicle;
DEF_COMMAND(CmdRefitRailVehicle); CommandProc CmdBuildSignalTrack;
CommandProc CmdRemoveSignalTrack;
DEF_COMMAND(CmdBuildSignalTrack); CommandProc CmdSetAutoReplace;
DEF_COMMAND(CmdRemoveSignalTrack);
DEF_COMMAND(CmdSetAutoReplace); CommandProc CmdCloneVehicle;
CommandProc CmdStartStopVehicle;
CommandProc CmdMassStartStopVehicle;
CommandProc CmdAutoreplaceVehicle;
CommandProc CmdDepotSellAllVehicles;
CommandProc CmdDepotMassAutoReplace;
DEF_COMMAND(CmdCloneVehicle); CommandProc CmdCreateGroup;
DEF_COMMAND(CmdStartStopVehicle); CommandProc CmdRenameGroup;
DEF_COMMAND(CmdMassStartStopVehicle); CommandProc CmdDeleteGroup;
DEF_COMMAND(CmdAutoreplaceVehicle); CommandProc CmdAddVehicleGroup;
DEF_COMMAND(CmdDepotSellAllVehicles); CommandProc CmdAddSharedVehicleGroup;
DEF_COMMAND(CmdDepotMassAutoReplace); CommandProc CmdRemoveAllVehiclesGroup;
CommandProc CmdSetGroupReplaceProtection;
DEF_COMMAND(CmdCreateGroup); CommandProc CmdMoveOrder;
DEF_COMMAND(CmdRenameGroup); CommandProc CmdChangeTimetable;
DEF_COMMAND(CmdDeleteGroup); CommandProc CmdSetVehicleOnTime;
DEF_COMMAND(CmdAddVehicleGroup); CommandProc CmdAutofillTimetable;
DEF_COMMAND(CmdAddSharedVehicleGroup); CommandProc CmdSetTimetableStart;
DEF_COMMAND(CmdRemoveAllVehiclesGroup);
DEF_COMMAND(CmdSetGroupReplaceProtection);
DEF_COMMAND(CmdMoveOrder);
DEF_COMMAND(CmdChangeTimetable);
DEF_COMMAND(CmdSetVehicleOnTime);
DEF_COMMAND(CmdAutofillTimetable);
DEF_COMMAND(CmdSetTimetableStart);
#undef DEF_COMMAND
/** /**
* The master command table * The master command table