mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r6649) - Codechange: Show more correct capacity of articulated wagons in the train purchase list.

This commit is contained in:
peter1138 2006-10-05 11:26:59 +00:00
parent 16271dfaac
commit cdfac3d7b7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
train.h
View File

@ -217,6 +217,7 @@ static inline Vehicle *GetNextVehicle(const Vehicle *v)
void ConvertOldMultiheadToNew(void); void ConvertOldMultiheadToNew(void);
void ConnectMultiheadedTrains(void); void ConnectMultiheadedTrains(void);
uint CountArticulatedParts(EngineID engine_type);
int CheckTrainInDepot(const Vehicle *v, bool needs_to_be_stopped); int CheckTrainInDepot(const Vehicle *v, bool needs_to_be_stopped);
void CcCloneTrain(bool success, TileIndex tile, uint32 p1, uint32 p2); void CcCloneTrain(bool success, TileIndex tile, uint32 p1, uint32 p2);

2
train_cmd.c
View File

@ -480,7 +480,7 @@ void DrawTrainEngine(int x, int y, EngineID engine, uint32 image_ormod)
DrawSprite(image | image_ormod, x, y); DrawSprite(image | image_ormod, x, y);
} }
static uint CountArticulatedParts(EngineID engine_type) uint CountArticulatedParts(EngineID engine_type)
{ {
uint16 callback; uint16 callback;
uint i; uint i;

4
train_gui.c
View File

@ -66,7 +66,7 @@ void DrawTrainEnginePurchaseInfo(int x, int y, EngineID engine_number)
SetDParam(2, STR_EMPTY); SetDParam(2, STR_EMPTY);
if (rvi->capacity != 0) { if (rvi->capacity != 0) {
SetDParam(0, _cargoc.names_long[rvi->cargo_type]); SetDParam(0, _cargoc.names_long[rvi->cargo_type]);
SetDParam(1, rvi->capacity << multihead); SetDParam(1, (rvi->capacity * (CountArticulatedParts(engine_number) + 1)) << multihead);
SetDParam(2, STR_9842_REFITTABLE); SetDParam(2, STR_9842_REFITTABLE);
} }
DrawString(x,y, STR_PURCHASE_INFO_CAPACITY, 0); DrawString(x,y, STR_PURCHASE_INFO_CAPACITY, 0);
@ -114,7 +114,7 @@ void DrawTrainWagonPurchaseInfo(int x, int y, EngineID engine_number)
SetDParam(2, STR_EMPTY); SetDParam(2, STR_EMPTY);
if (rvi->capacity != 0) { if (rvi->capacity != 0) {
SetDParam(0, _cargoc.names_long[rvi->cargo_type]); SetDParam(0, _cargoc.names_long[rvi->cargo_type]);
SetDParam(1, rvi->capacity); SetDParam(1, rvi->capacity * (CountArticulatedParts(engine_number) + 1));
SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY); SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY);
} }
DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, 0); DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, 0);