(svn r2645) Fix (useless)warning in graph_gui and add brackets around HASBIT in an if statement

This commit is contained in:
Darkvater 2005-07-19 22:29:35 +00:00
parent f0c0c03c5f
commit 2379c59ab8
2 changed files with 3 additions and 4 deletions

View File

@ -1150,7 +1150,6 @@ static void SignListWndProc(Window *w, WindowEvent *e)
{
switch (e->event) {
case WE_PAINT: {
uint32 i;
int y = 16; // offset from top of widget
if (_sign_sort_dirty)
@ -1167,8 +1166,8 @@ static void SignListWndProc(Window *w, WindowEvent *e)
return;
}
{
SignStruct *ss;
{ const SignStruct *ss;
uint16 i;
/* Start drawing the signs */
for (i = w->vscroll.pos; i < w->vscroll.cap + w->vscroll.pos && i < w->vscroll.count; i++) {

View File

@ -47,7 +47,7 @@ void TrainCargoChanged(Vehicle *v) {
vweight += rvi->weight;
vweight += (_cargoc.weights[u->cargo_type] * u->cargo_count) / 16;
// powered wagons have extra weight added
if HASBIT(u->u.rail.flags, VRF_POWEREDWAGON)
if (HASBIT(u->u.rail.flags, VRF_POWEREDWAGON))
vweight += RailVehInfo(v->engine_type)->pow_wag_weight;
// consist weight is the sum of the weight of all vehicles in the consist