diff options
| author | ludde <ludde@openttd.org> | 2005-07-16 20:58:04 +0000 |
|---|---|---|
| committer | ludde <ludde@openttd.org> | 2005-07-16 20:58:04 +0000 |
| commit | 594dd34e84e78b03e1cdeb7cf262707fd714a5fa (patch) | |
| tree | 69f0f649731f03bc4b9a79121d4b839e7400a826 /train_gui.c | |
| parent | cb5fc8f6ffa0062f395bbf742390db6411f4fe32 (diff) | |
| download | openttd-594dd34e84e78b03e1cdeb7cf262707fd714a5fa.tar.xz | |
(svn r2594) Fix: [strgen] Misc updates to the string system.
- Renamed the plural command to "P" instead of "PLURAL". Now write something like this to append an s on plural: {P "" s}. (You can optionally still add an argument index to explicitly specifiy which number that's used)
- Removed the pluralized cargo strings from the string files. The new method is to use the plural specifier {P}
- Added support for genders. First add "##gender der das die" on top, then use {G=der} on a cargoname/industry to set the gender, and to switch between genders do something like {G neu neu neue} {STRING}
- Updated the swedish/english translation with P strings.
Diffstat (limited to 'train_gui.c')
| -rw-r--r-- | train_gui.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/train_gui.c b/train_gui.c index ccd36e4a5..fb09cbbb3 100644 --- a/train_gui.c +++ b/train_gui.c @@ -60,7 +60,7 @@ void DrawTrainEnginePurchaseInfo(int x, int y, EngineID engine_number) SetDParam(0, STR_8838_N_A); SetDParam(2, STR_EMPTY); if (rvi->capacity != 0) { - SetDParam(0, _cargoc.names_long_p[rvi->cargo_type]); + SetDParam(0, _cargoc.names_long[rvi->cargo_type]); SetDParam(1, rvi->capacity << multihead); SetDParam(2, STR_9842_REFITTABLE); } @@ -101,7 +101,7 @@ void DrawTrainWagonPurchaseInfo(int x, int y, EngineID engine_number) y += 10; /* Cargo type + capacity */ - SetDParam(0, _cargoc.names_long_p[rvi->cargo_type]); + SetDParam(0, _cargoc.names_long[rvi->cargo_type]); SetDParam(1, rvi->capacity); SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY); DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, 0); @@ -730,7 +730,7 @@ static void RailVehicleRefitWndProc(Window *w, WindowEvent *e) int32 cost = DoCommandByTile(v->tile, v->index, WP(w,refit_d).cargo, DC_QUERY_COST, CMD_REFIT_RAIL_VEHICLE); if (!CmdFailed(cost)) { SetDParam(2, cost); - SetDParam(0, _cargoc.names_long_p[WP(w,refit_d).cargo]); + SetDParam(0, _cargoc.names_long[WP(w,refit_d).cargo]); SetDParam(1, _returned_refit_amount); DrawString(1, 137, STR_9840_NEW_CAPACITY_COST_OF_REFIT, 0); } @@ -1010,8 +1010,8 @@ static void TrainDetailsInfoTab(const Vehicle *v, int x, int y) static void TrainDetailsCapacityTab(const Vehicle *v, int x, int y) { if (v->cargo_cap != 0) { + SetDParam(0, _cargoc.names_long[v->cargo_type]); SetDParam(1, v->cargo_cap); - SetDParam(0, _cargoc.names_long_p[v->cargo_type]); DrawString(x, y, STR_013F_CAPACITY, 0); } } |