summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-10-03 16:05:11 +0000
committerbjarni <bjarni@openttd.org>2006-10-03 16:05:11 +0000
commit950ef8f2373a2bf561d256f42c07606c3ce00854 (patch)
tree7069b27f3099a815900fd4fe6d28154d2d5ebc9a
parentf86375b6789e5cff4af22e7ec2469cd6edf07ccb (diff)
downloadopenttd-950ef8f2373a2bf561d256f42c07606c3ce00854.tar.xz
(svn r6627) -Fix r6624: fixed some warnings
Now it happened again. Somebody got warnings, that I didn't get... I will look into this issue
-rw-r--r--order.h2
-rw-r--r--order_cmd.c5
-rw-r--r--order_gui.c2
3 files changed, 9 insertions, 0 deletions
diff --git a/order.h b/order.h
index fd7f96e7e..43b8e9c71 100644
--- a/order.h
+++ b/order.h
@@ -191,6 +191,8 @@ static inline Order UnpackOrder(uint32 packed)
order.dest = GB(packed, 16, 16);
order.next = NULL;
order.index = 0; // avoid compiler warning
+ order.refit_cargo = CT_INVALID;
+ order.refit_subtype = 0;
return order;
}
diff --git a/order_cmd.c b/order_cmd.c
index fad343b1f..b87fb6879 100644
--- a/order_cmd.c
+++ b/order_cmd.c
@@ -57,6 +57,9 @@ Order UnpackOldOrder(uint16 packed)
order.flags = 0;
}
+ order.refit_cargo = CT_INVALID;
+ order.refit_subtype = 0;
+
return order;
}
@@ -73,6 +76,8 @@ static Order UnpackVersion4Order(uint16 packed)
order.dest = GB(packed, 8, 8);
order.next = NULL;
order.index = 0; // avoid compiler warning
+ order.refit_cargo = CT_INVALID;
+ order.refit_subtype = 0;
return order;
}
diff --git a/order_gui.c b/order_gui.c
index 66a30ba7e..bce259121 100644
--- a/order_gui.c
+++ b/order_gui.c
@@ -215,6 +215,8 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
Order order;
order.next = NULL;
order.index = 0;
+ order.refit_cargo = CT_INVALID;
+ order.refit_subtype = 0;
// check depot first
if (_patches.gotodepot) {