(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
-Codechange: Add and use RAILVEH_SINGLEHEAD when railveh_type is set to 0, which was implicit before. -Cleanup: Remove some extraneous parenthesis.
This commit is contained in:
@@ -158,7 +158,7 @@ static void TrainViewWndProc(Window *w, WindowEvent *e)
|
||||
/* See if any vehicle can be refitted */
|
||||
for (u = v; u != NULL; u = u->next) {
|
||||
if (EngInfo(u->engine_type)->refit_mask != 0 ||
|
||||
(!(RailVehInfo(v->engine_type)->flags & RVI_WAGON) && v->cargo_cap != 0)) {
|
||||
(RailVehInfo(v->engine_type)->railveh_type != RAILVEH_WAGON && v->cargo_cap != 0)) {
|
||||
EnableWindowWidget(w, 12);
|
||||
/* We have a refittable carriage, bail out */
|
||||
break;
|
||||
@@ -341,7 +341,7 @@ static void TrainDetailsCargoTab(const Vehicle *v, int x, int y)
|
||||
|
||||
static void TrainDetailsInfoTab(const Vehicle *v, int x, int y)
|
||||
{
|
||||
if (RailVehInfo(v->engine_type)->flags & RVI_WAGON) {
|
||||
if (RailVehInfo(v->engine_type)->railveh_type == RAILVEH_WAGON) {
|
||||
SetDParam(0, GetCustomEngineName(v->engine_type));
|
||||
SetDParam(1, v->value);
|
||||
DrawString(x, y, STR_882D_VALUE, 0x10);
|
||||
|
Reference in New Issue
Block a user