gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-06-21 12:39:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

(svn r2959) - Fix: [ 1266036 ] Fix [ 1236317 ] Vehicles with and TRANSFER order don't have that order restored (i_dachev). Also disallow non-train type vehicles to have non-stop orders.

Browse Source
This commit is contained in:
Darkvater 2005-09-16 16:03:18 +00:00
parent 4797310f91
commit c930f8f8c0
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
order.h
View File

@ -90,10 +90,12 @@ typedef struct Order {
uint16 index; //! Index of the order, is not saved or anything, just for reference uint16 index; //! Index of the order, is not saved or anything, just for reference
} Order; } Order;
#define MAX_BACKUP_ORDER_COUNT 40
typedef struct { typedef struct {
VehicleID clone; VehicleID clone;
OrderID orderindex; OrderID orderindex;
Order order[41]; Order order[MAX_BACKUP_ORDER_COUNT + 1];
uint16 service_interval; uint16 service_interval;
char name[32]; char name[32];
} BackuppedOrders; } BackuppedOrders;

34
order_cmd.c
View File

@ -2,6 +2,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "openttd.h" #include "openttd.h"
#include "order.h"
#include "airport.h" #include "airport.h"
#include "depot.h" #include "depot.h"
#include "functions.h" #include "functions.h"
@ -202,13 +203,25 @@ int32 CmdInsertOrder(int x, int y, uint32 flags, uint32 p1, uint32 p2)
default: return CMD_ERROR; default: return CMD_ERROR;
} }
/* Order flags can be any of the following for stations:
* [full-load | unload] [+ transfer] [+ non-stop]
* non-stop orders (if any) are only valid for trains */
switch (new_order.flags) { switch (new_order.flags) {
case 0: case 0: /* Fallthrough */
case OF_FULL_LOAD: case OF_FULL_LOAD:
case OF_FULL_LOAD | OF_TRANSFER: /* Fallthrough */
case OF_UNLOAD: case OF_UNLOAD:
case OF_UNLOAD | OF_TRANSFER: /* Fallthrough */
case OF_TRANSFER:
break;
case OF_NON_STOP: case OF_NON_STOP:
case OF_NON_STOP | OF_FULL_LOAD: case OF_NON_STOP | OF_FULL_LOAD:
case OF_NON_STOP | OF_FULL_LOAD | OF_TRANSFER: /* Fallthrough */
case OF_NON_STOP | OF_UNLOAD: case OF_NON_STOP | OF_UNLOAD:
case OF_NON_STOP | OF_UNLOAD | OF_TRANSFER: /* Fallthrough */
case OF_NON_STOP | OF_TRANSFER:
if (v->type != VEH_Train) return CMD_ERROR;
break; break;
default: return CMD_ERROR; default: return CMD_ERROR;
@ -235,10 +248,8 @@ int32 CmdInsertOrder(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!IsDepotIndex(new_order.station)) return CMD_ERROR; if (!IsDepotIndex(new_order.station)) return CMD_ERROR;
dp = GetDepot(new_order.station); dp = GetDepot(new_order.station);
if (!IsValidDepot(dp) || if (!IsValidDepot(dp) || !CheckOwnership(GetTileOwner(dp->xy)))
!CheckOwnership(GetTileOwner(dp->xy))) {
return CMD_ERROR; return CMD_ERROR;
}
switch (v->type) { switch (v->type) {
case VEH_Train: case VEH_Train:
@ -257,11 +268,17 @@ int32 CmdInsertOrder(int x, int y, uint32 flags, uint32 p1, uint32 p2)
} }
} }
/* Order flags can be any of the following for depots:
* order [+ halt] [+ non-stop]
* non-stop orders (if any) are only valid for trains */
switch (new_order.flags) { switch (new_order.flags) {
case OF_PART_OF_ORDERS: case OF_PART_OF_ORDERS:
case OF_PART_OF_ORDERS | OF_HALT_IN_DEPOT: case OF_PART_OF_ORDERS | OF_HALT_IN_DEPOT:
break;
case OF_NON_STOP | OF_PART_OF_ORDERS: case OF_NON_STOP | OF_PART_OF_ORDERS:
case OF_NON_STOP | OF_PART_OF_ORDERS | OF_HALT_IN_DEPOT: case OF_NON_STOP | OF_PART_OF_ORDERS | OF_HALT_IN_DEPOT:
if (v->type != VEH_Train) return CMD_ERROR;
break; break;
default: return CMD_ERROR; default: return CMD_ERROR;
@ -279,9 +296,14 @@ int32 CmdInsertOrder(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!CheckOwnership(GetTileOwner(wp->xy))) return CMD_ERROR; if (!CheckOwnership(GetTileOwner(wp->xy))) return CMD_ERROR;
/* Order flags can be any of the following for waypoints:
* [non-stop]
* non-stop orders (if any) are only valid for trains */
switch (new_order.flags) { switch (new_order.flags) {
case 0: case 0: break;
case OF_NON_STOP: case OF_NON_STOP:
if (v->type != VEH_Train) return CMD_ERROR;
break; break;
default: return CMD_ERROR; default: return CMD_ERROR;
@ -298,7 +320,7 @@ int32 CmdInsertOrder(int x, int y, uint32 flags, uint32 p1, uint32 p2)
/* XXX - This limit is only here because the backuppedorders can't /* XXX - This limit is only here because the backuppedorders can't
* handle any more then this.. */ * handle any more then this.. */
if (v->num_orders >= 40) return_cmd_error(STR_8832_TOO_MANY_ORDERS); if (v->num_orders >= MAX_BACKUP_ORDER_COUNT) return_cmd_error(STR_8832_TOO_MANY_ORDERS);
/* For ships, make sure that the station is not too far away from the /* For ships, make sure that the station is not too far away from the
* previous destination, for human players with new pathfinding disabled */ * previous destination, for human players with new pathfinding disabled */