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

(svn r1544) -Fix: SwapOrder did not use AssignOrder, which caused the saveroutine to 

crash from time to time
-Codechange: added const before 'Order *' where possible
This commit is contained in:
truelight 2005-01-16 14:42:53 +00:00
parent be5a832db3
commit 8e404a26f6
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ai.c
View File

@ -3609,7 +3609,7 @@ static void AiStateRemoveStation(Player *p)
{
// Remove stations that aren't in use by any vehicle
byte in_use[256], *used;
Order *ord;
const Order *ord;
Station *st;
uint tile;

2
aircraft_cmd.c
View File

@ -1023,7 +1023,7 @@ static void HandleAircraftSmoke(Vehicle *v)
static void ProcessAircraftOrder(Vehicle *v)
{
Order *order;
const Order *order;
// OT_GOTO_DEPOT, OT_LOADING
if (v->current_order.type == OT_GOTO_DEPOT ||

2
order.h
View File

@ -74,7 +74,7 @@ static inline Order *GetOrder(uint index)
static inline bool HasOrderPoolFree(uint amount)
{
Order *order;
const Order *order;
FOR_ALL_ORDERS(order)
if (order->type == OT_NOTHING)

6
order_cmd.c
View File

@ -67,8 +67,10 @@ static void SwapOrders(Order *order1, Order *order2)
Order temp_order;
temp_order = *order1;
*order1 = *order2;
*order2 = temp_order;
AssignOrder(order1, *order2);
order1->next = order2->next;
AssignOrder(order2, temp_order);
order2->next = temp_order.next;
}
/**

2
order_gui.c
View File

@ -387,7 +387,7 @@ static void OrdersWndProc(Window *w, WindowEvent *e)
sel += w->vscroll.pos;
if (_ctrl_pressed && sel < v->num_orders) {
Order *ord = GetVehicleOrder(v, sel);
const Order *ord = GetVehicleOrder(v, sel);
int xy = 0;
switch (ord->type) {
case OT_GOTO_STATION: /* station order */