summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2005-07-19 22:29:35 +0000
committerDarkvater <darkvater@openttd.org>2005-07-19 22:29:35 +0000
commit2379c59ab8e3a2bf022a3ed104fad81da3112298 (patch)
tree001a291418e4a47672d9d859a4b11046fc6cfe81
parentf0c0c03c5f6eceafa0b10f40f413e893d02f34e8 (diff)
downloadopenttd-2379c59ab8e3a2bf022a3ed104fad81da3112298.tar.xz
(svn r2645) Fix (useless)warning in graph_gui and add brackets around HASBIT in an if statement
-rw-r--r--graph_gui.c5
-rw-r--r--train_cmd.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/graph_gui.c b/graph_gui.c
index 6f65854f1..0c3ecf5bc 100644
--- a/graph_gui.c
+++ b/graph_gui.c
@@ -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++) {
diff --git a/train_cmd.c b/train_cmd.c
index 6508eaa58..5a5eb70ff 100644
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -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