diff options
| author | smatz <smatz@openttd.org> | 2008-09-15 19:02:50 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2008-09-15 19:02:50 +0000 |
| commit | 1266b1a73f4197e3bf4d2cc0e09e9e667d7c640e (patch) | |
| tree | 9ea3e279046e9a622321db881df0c37605fde380 /src/build_vehicle_gui.cpp | |
| parent | 42f33890aa4612a821c20783778bb086ee2028b6 (diff) | |
| download | openttd-1266b1a73f4197e3bf4d2cc0e09e9e667d7c640e.tar.xz | |
(svn r14334) -Feature: ability to reset name to default/automatic value (for vehicles, engines, towns, groups, stations, waypoints, managers and companies)
Diffstat (limited to 'src/build_vehicle_gui.cpp')
| -rw-r--r-- | src/build_vehicle_gui.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index 806dd9940..d668e98f0 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -1094,7 +1094,7 @@ struct BuildVehicleWindow : Window { case VEH_AIRCRAFT: str = STR_A039_RENAME_AIRCRAFT_TYPE; break; } SetDParam(0, sel_eng); - ShowQueryString(STR_ENGINE_NAME, str, MAX_LENGTH_ENGINE_NAME_BYTES, MAX_LENGTH_ENGINE_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_NONE); + ShowQueryString(STR_ENGINE_NAME, str, MAX_LENGTH_ENGINE_NAME_BYTES, MAX_LENGTH_ENGINE_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); } break; } @@ -1156,18 +1156,18 @@ struct BuildVehicleWindow : Window { virtual void OnQueryTextFinished(char *str) { - if (!StrEmpty(str)) { - StringID err_str = STR_NULL; - _cmd_text = str; - switch (this->vehicle_type) { - default: NOT_REACHED(); - case VEH_TRAIN: err_str = STR_886B_CAN_T_RENAME_TRAIN_VEHICLE; break; - case VEH_ROAD: err_str = STR_9037_CAN_T_RENAME_ROAD_VEHICLE; break; - case VEH_SHIP: err_str = STR_9839_CAN_T_RENAME_SHIP_TYPE; break; - case VEH_AIRCRAFT: err_str = STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE; break; - } - DoCommandP(0, this->rename_engine, 0, NULL, CMD_RENAME_ENGINE | CMD_MSG(err_str)); + if (str == NULL) return; + + StringID err_str = STR_NULL; + _cmd_text = str; + switch (this->vehicle_type) { + default: NOT_REACHED(); + case VEH_TRAIN: err_str = STR_886B_CAN_T_RENAME_TRAIN_VEHICLE; break; + case VEH_ROAD: err_str = STR_9037_CAN_T_RENAME_ROAD_VEHICLE; break; + case VEH_SHIP: err_str = STR_9839_CAN_T_RENAME_SHIP_TYPE; break; + case VEH_AIRCRAFT: err_str = STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE; break; } + DoCommandP(0, this->rename_engine, 0, NULL, CMD_RENAME_ENGINE | CMD_MSG(err_str)); } virtual void OnDropdownSelect(int widget, int index) |